Skip to content

Commit

Permalink
Merge branch 'release/0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
jtnelson committed Feb 1, 2015
2 parents 2b82401 + ebfe90d commit 541bcb2
Show file tree
Hide file tree
Showing 120 changed files with 27,447 additions and 2,416 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.2
0.4.3
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Concourse runs on Java 1.7.

#### Versioning

This is version 0.4.2 of Concourse.
This is version 0.4.3 of Concourse.

Concourse will be maintained under the [Semantic Versioning](http://semver.org)
guidelines such that release versions will be formatted as `<major>.<minor>.<patch>`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.junit.Assert;
import org.junit.Test;

import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Lists;

/**
* Unit tests for {@link CachedConnectionPool}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ protected void failed(Throwable t, Description description) {
System.out.println("---");
System.out.println(Variables.dump());
System.out.println("");
stop();
afterEachTest();
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions concourse-server/conf/.concourse.conf
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ wrapper.java.additional.2=-Dcom.sun.management.jmxremote.port=9010
wrapper.java.additional.3=-Dcom.sun.management.jmxremote.local.only=false
wrapper.java.additional.4=-Dcom.sun.management.jmxremote.authenticate=false
wrapper.java.additional.5=-Dcom.sun.management.jmxremote.ssl=false
wrapper.java.additional.6=-XX:+UseThreadPriorities
wrapper.java.additional.7=-XX:ThreadPriorityPolicy=42
wrapper.java.additional.8=-XX:CompileThreshold=500

# Initial Java Heap Size (in MB)
wrapper.java.initmemory=512
Expand Down
20 changes: 15 additions & 5 deletions concourse-server/conf/concourse.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
# DEFAULT: {$user.home}/concourse/buffer
#buffer_directory = /var/lib/concourse/buffer

# The size for each page in the Buffer. During reads, Buffer pages are
# individually locked, so it is desirable to have several smaller pages as
# opposed to few larger ones. Nevertheless, be sure to balance the desire to
# maximize lock granularity with the risks of having too many open buffer files
# The size for each page in the Buffer. It is generally desirable to have
# several smaller pages in the Buffer to maximize read and indexing throughput
# but this should be baanced with the risks of having too many open buffer files
# which may lead to more frequent and less efficient disk I/O.
#
# DEFAULT: 8KB
Expand All @@ -33,7 +32,7 @@

# The default environment that is automatically loaded when the server
# starts and is used whenever a client does not specify an environment
# for a connection.
# when connecting.
#default_environment = default

# Determine whether log messages should also be printed to the console (STDOUT)
Expand All @@ -49,6 +48,17 @@
# the initial and maximum heap sizes to the specified value, so there
# must be enough system memory available for Concourse Server to start.
#
# Be careful and avoid setting the heap size too large because this may
# cause longer garbage collection (gc) pauses or interfere with the ability
# of Concourse Server to memory map (mmap) certain data files. We
# recommend the following sizing guidelines:
#
# SYSTEM MEMORY | Recommended heap_size
# -----------------------------------------------------------
# Less than 2GB | 1/2 system memory
# 2GB to 4GB | 1GB
# Greater than 4GB | 1/4 system memory, but not more than 8GB
#
# DEFAULT: 1GB
#heap_size = 1GB

Expand Down
5 changes: 3 additions & 2 deletions concourse-server/launch/Start Concourse.launch
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cinchapi.concourse.server.ConcourseServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="concourse-server"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse=true -Xms512m -Xmx1024m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse=true -Xms512m -Xmx1024m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -XX:+UseThreadPriorities -XX:ThreadPriorityPolicy=42 -XX:CompileThreshold=500"/>
</launchConfiguration>
Loading

0 comments on commit 541bcb2

Please sign in to comment.