GitHub user tim-to opened a pull request:
https://github.com/apache/accumulo/pull/20
1.6
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/accumulo 1.6
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/accumulo/pull/20.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #20
----
commit 22de8d5237ff14b9c46638df0f998368f80a5cc9
Author: Christopher Tubbs <[email protected]>
Date: 2014-09-12T21:36:39Z
ACCUMULO-3078 Fix ConditionalWriterIT trace test
Discovered by "dead code" warning.
commit d3e17f4582634e0f4985c1f3a92afcd67e999427
Author: Christopher Tubbs <[email protected]>
Date: 2014-09-12T22:16:09Z
ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
commit 939ed96bb31a5473a4eaf22e072c84ab76b29fbf
Author: Corey J. Nolet <[email protected]>
Date: 2014-09-13T01:19:31Z
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
commit bc53d3a4be7466524f9106d9b97399d6f6ba2119
Author: Josh Elser <[email protected]>
Date: 2014-09-15T15:17:47Z
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
CHANGES
commit 4556ec4bd1d7057fa485e2531348ae4e57b4cc88
Author: Josh Elser <[email protected]>
Date: 2014-09-15T21:05:34Z
ACCUMULO-3128 Reduce zookeeper log spam
Also reduce SslConnectionParams because that was just as spammy
commit e455005f6e9a33f82eb25d6b89816704ad8663de
Author: Josh Elser <[email protected]>
Date: 2014-09-15T22:49:16Z
ACCUMULO-3128 Screwed up the conditional
commit 7f62ec1b37dc1e8fe7512358360dcb591b0ba224
Author: Josh Elser <[email protected]>
Date: 2014-09-16T00:26:02Z
ACCUMULO-3129 Pass credential provider into client configuration and set
non-empty truststore password.
Making a non-empty password for the truststore makes things a bit
more reliable to actually work (I think empty passwords are disallowed
by the CredentialProvider impls). If the client is also using a
CredentialProvider, the ClientConfiguration also needs this property.
Adding the extra value to the enum passes it from accumulo-site.xml
into the generate client.conf by AbstractMacIT.
commit 0055bab8b94bb87c1b65db6223a5ae8840d2d52c
Author: Eric C. Newton <[email protected]>
Date: 2014-09-16T21:22:53Z
ACCUMULO-3132 kludge the deserialization to work with 1.6.0 FATE objects
commit 2e273505d9ca2d32db48d2052f38be2625119bec
Author: Josh Elser <[email protected]>
Date: 2014-09-16T21:54:42Z
ACCUMULO-3136 Be a little more rigid on the ActiveScans we observe.
We might get scans by the system to the metadata table instead of
the scan we run in the test case. When this happens, the test will
timeout because the interrupt happens before the scan is running, and then
the scan just sits on the SlowIterator.
commit 3e4d07b2fd967328fe1161b0dfad1fdf72191829
Author: Josh Elser <[email protected]>
Date: 2014-09-17T04:56:25Z
ACCUMULO-3138 Pass down the SSL/CredentialProvider ClientConfiguration into
the input format
commit 597b787cee82a0cb3a8c39e70de312878d0182fc
Author: Eric C. Newton <[email protected]>
Date: 2014-09-17T15:14:04Z
ACCUMULO-3132 setting TInfo's serialization value is much simpler
After discussing it with [~kturner], this change seems simpler and
supports 1.6.1 -> 1.6.0 revert of an upgrade. The unit test will
catch any re-generation of the file.
commit 0bd5d438578f45e66eaa0dcd7cfb81f8693841ee
Author: Eric C. Newton <[email protected]>
Date: 2014-09-17T15:18:37Z
Merge remote branch 'origin/1.6.1-SNAPSHOT' into 1.6.1-SNAPSHOT
commit 4cf467b926d7beae17b47103105d892f24e75e70
Author: Josh Elser <[email protected]>
Date: 2014-09-17T19:06:41Z
ACCUMULO-3139 Reflect on UNIXProcess to get the pid and use kill instead of
pkill.
pkill has the potential to overmatch and SIGSTOP+SIGCONT other tablet
servers on the same node. If it tries to match tservers started by
other users, this will also fail, AFAICT.
commit d0f95f85a484e190ddaeb753ab141ce7c3d84ff1
Author: Josh Elser <[email protected]>
Date: 2014-09-17T21:07:30Z
ACCUMULO-3139 Some extra test stabilizations for BalanceAfterCommsFailureIT
commit 255ce5f25164dc1c429ee57bbeecfdb1f976cacb
Author: Josh Elser <[email protected]>
Date: 2014-09-18T16:23:26Z
ACCUMULO-3078 ACCUMULO-3138 Remove the getStaticCluster reference again
The AccumuloConfiguration from the Instance is at least the
ClientConfiguration. We can use that to remove the reliance
on needing the shared MiniAccumuloCluster.
commit 32570d5a554503d7af6c76379edd8d46175637e2
Author: Josh Elser <[email protected]>
Date: 2014-09-18T18:33:21Z
ACCUMULO-3144 Give the servers some time to flush out their buffers to the
MAC log pipe.
commit 992414ebba8109b601846b5c279bf72b8165485d
Author: Josh Elser <[email protected]>
Date: 2014-09-18T19:01:02Z
ACCUMULO-3145 Fix loop invariants in listscans
Added some extra logging and (automatically) fixed formatting.
commit 7a40f7bfa4c6e30467a24105da974687ac442cdf
Author: Josh Elser <[email protected]>
Date: 2014-09-18T22:12:12Z
ACCUMULO-3146 Try to stabilize BalanceAfterCommsFailureIT and
SimpleBalancerFairnessIT
commit ddd2c3bc098531d8dadee1b5142cfb80c50f4c41
Author: Corey J. Nolet <[email protected]>
Date: 2014-09-19T00:11:41Z
ACCUMULO-3143 Offline scan property is now being properly serialized. Added
verification that all other booleans are being serialized.
commit 5878a776635077ba48def878c39c2116cd89f50c
Author: Eric C. Newton <[email protected]>
Date: 2014-09-19T12:17:58Z
ACCUMULO-3049 close the connections to the tservers
commit 693daa77399b634f40d62903cdbb27f9e84ceb36
Author: Eric C. Newton <[email protected]>
Date: 2014-09-19T17:57:11Z
ACCUMULO-3153 ACCUMULO-3152
commit 287e4a67349c190ee5c52d91ee340ca53778e5c9
Author: Eric C. Newton <[email protected]>
Date: 2014-09-19T17:57:59Z
ACCUMULO-3152 fix typo
commit 51ec5a16d4deaa9be426497ebe4b8c673df454ae
Author: Josh Elser <[email protected]>
Date: 2014-09-19T18:07:21Z
Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
assemble/pom.xml
core/pom.xml
examples/pom.xml
examples/simple/pom.xml
fate/pom.xml
minicluster/pom.xml
minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
pom.xml
proxy/pom.xml
server/tserver/pom.xml
start/pom.xml
test/pom.xml
trace/pom.xml
commit 984ba22daa54c39cc4f95864bf1ca4b441534676
Author: Josh Elser <[email protected]>
Date: 2014-09-19T18:35:05Z
Merge remote-tracking branch 'origin/1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT
commit 3c6876d1415081a0eac73e41503863cb68b2dfd8
Author: Josh Elser <[email protected]>
Date: 2014-09-19T18:35:15Z
Merge remote-tracking branch 'origin/1.6.1-SNAPSHOT' into 1.6.1-SNAPSHOT
commit fbcf2f5636c18fd1c65b9839b8255c22a56b8b7f
Author: Josh Elser <[email protected]>
Date: 2014-09-19T19:00:22Z
Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT
commit dcb081cae9d4ca5cd5f3e3b271f87196f5b2db55
Author: Josh Elser <[email protected]>
Date: 2014-09-19T19:25:16Z
ACCUMULO-3148 Change the verification of HalfDeadTServerIT
The test can fail in situations where we expect it to pass
(tserver dies and had lost its ZK session, but "Session expired"
doesn't make it into the stdout). Try to make the verification
a bit more reliable.
commit 8959d264634315d3e9c4b45f8f9832b429183798
Author: Keith Turner <[email protected]>
Date: 2014-09-19T21:27:09Z
Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
commit e1c9a1f6c896f39534a95236a2e0fc0409d88b5b
Author: Keith Turner <[email protected]>
Date: 2014-09-19T22:20:13Z
Merge branch '1.6.1-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
commit 7ee86286c2ba8d215f9afcbefa794cf3a0de5b14
Author: Josh Elser <[email protected]>
Date: 2014-09-19T23:23:59Z
Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
