[6/6] accumulo git commit: Merge branch '1.7'

2016-04-25 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a605d225 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a605d225 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a605d225 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-04-17 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1cb53b1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1cb53b1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1cb53b1 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-04-12 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a6133a6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a6133a6a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a6133a6a Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-04-07 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35252694 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35252694 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35252694 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-04-05 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52318429 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52318429 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52318429 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-04-01 Thread elserj
Merge branch '1.7' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0dd1d6a5 Tree: http://git-wip-us.apache.org/repos/asf/accu

[6/6] accumulo git commit: Merge branch '1.7'

2016-03-24 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1d490300 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d490300 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d490300 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-03-03 Thread ctubbsii
Merge branch '1.7' Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db213159 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db213159 Diff: http://git-wip-us.apache.org/repos/asf/acc

[6/6] accumulo git commit: Merge branch '1.7'

2016-02-12 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c023a3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c023a3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c023a3c Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-02-10 Thread ctubbsii
Merge branch '1.7' Conflicts: test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8949fd46 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89

[6/6] accumulo git commit: Merge branch '1.7'

2016-02-03 Thread ctubbsii
Merge branch '1.7' Conflicts: maven-plugin/src/it/plugin-test/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/03246da4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/03246da4 Diff: http://git

[6/6] accumulo git commit: Merge branch '1.7'

2016-02-03 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78cbeab8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78cbeab8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78cbeab8 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-29 Thread elserj
Merge branch '1.7' Conflicts: core/.gitignore minicluster/.gitignore start/.gitignore Closes apache/accumulo#66 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a6b4820 Tree: http://git-wip-us.a

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97ce2a75 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97ce2a75 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97ce2a75 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-13 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd515fce Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd515fce Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd515fce Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-11 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18725dd6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18725dd6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18725dd6 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-11 Thread ctubbsii
Merge branch '1.7' Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21123cca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21123cca Diff: http://git-wip-us.apache.org/repos/asf/acc

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-10 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7fe96f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7fe96f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7fe96f2 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-08 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c4ef06f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c4ef06f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c4ef06f Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-06 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c252d1a6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c252d1a6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c252d1a6 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-30 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9290ed3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9290ed3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9290ed3c Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-30 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/485c9235 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/485c9235 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/485c9235 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-30 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e721c391 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e721c391 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e721c391 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-28 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f4cb62b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f4cb62b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f4cb62b Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-09 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbbc0c54 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbbc0c54 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbbc0c54 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-04 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3b862d8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3b862d8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3b862d8 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-03 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f02a65cd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f02a65cd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f02a65cd Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-12-03 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46e5d5c8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46e5d5c8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46e5d5c8 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-11-21 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b6e68b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b6e68b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b6e68b6 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-10-28 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a3082d6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a3082d6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a3082d6 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-10-25 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/469984c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/469984c4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/469984c4 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-10-21 Thread elserj
Merge branch '1.7' Conflicts: test/src/main/java/org/apache/accumulo/test/NamespacesIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a81b966a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a81

[6/6] accumulo git commit: Merge branch '1.7'

2015-10-03 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/647cfb74 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/647cfb74 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/647cfb74 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-10-03 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a2396ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a2396ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a2396ee Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-10-01 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18e834ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18e834ec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18e834ec Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-09-12 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b4e57ac Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b4e57ac Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b4e57ac Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-08-24 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e45a37d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e45a37d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e45a37d Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-08-23 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7059d734 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7059d734 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7059d734 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-08-21 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b921411d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b921411d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b921411d Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-08-20 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4dee3c17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dee3c17 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dee3c17 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-08-05 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b16c6453 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b16c6453 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b16c6453 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-07-02 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1dd6b704 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1dd6b704 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1dd6b704 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-24 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6697ed5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6697ed5b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6697ed5b Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-24 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3af9826 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3af9826 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3af9826 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-23 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29fdbfbb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29fdbfbb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29fdbfbb Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-17 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/686ee12f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/686ee12f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/686ee12f Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-09 Thread ctubbsii
Merge branch '1.7' Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6df8991 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6df8991 Diff: http://git-wip-us.apache.org/repos/asf/acc

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-09 Thread ctubbsii
Merge branch '1.7' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/93f285ee Tree: http://git-wip-us.apache.org/repos/asf/acc

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-09 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f839 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f839 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f839 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-03 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/044e46df Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/044e46df Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/044e46df Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-06-01 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fba068b7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fba068b7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fba068b7 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-29 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe645109 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe645109 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fe645109 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-27 Thread elserj
Merge branch '1.7' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae2255c8 Tree: http://git-wip-us.apache.org/repos/a

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-27 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/535e2f35 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/535e2f35 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/535e2f35 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-26 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca5928e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca5928e2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca5928e2 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-26 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0138249c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0138249c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0138249c Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-21 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/350b491d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/350b491d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/350b491d Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-20 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cd82738 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cd82738 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9cd82738 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-11 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e055274 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e055274 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e055274 Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-08 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4caf8af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4caf8af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4caf8af Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-04 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca02e85d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca02e85d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca02e85d Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-05-04 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e15913d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e15913d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e15913d Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-04-27 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf0bcb3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf0bcb3f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf0bcb3f Branch:

[6/6] accumulo git commit: Merge branch '1.7'

2015-04-23 Thread ecn
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/489c9279 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/489c9279 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/489c9279 Branch: