git commit: ACCUMULO-1419 Update README, confs and poms to switch default hadoop dependency to 2.2.0.

2013-10-27 Thread elserj
Updated Branches: refs/heads/master a1495e382 - cdc1dc9f0 ACCUMULO-1419 Update README, confs and poms to switch default hadoop dependency to 2.2.0. Document the change in default Apache Hadoop dependency. Update configurations to account for new HADOOP_CONF_DIR and hadoop-2 classpath entries.

git commit: ACCUMULO-1819 Update Makefile for native map to build on new OSX version

2013-10-27 Thread elserj
Updated Branches: refs/heads/1.4.5-SNAPSHOT 7bf6148f2 - 0e882211f ACCUMULO-1819 Update Makefile for native map to build on new OSX version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0e882211 Tree:

[1/2] git commit: ACCUMULO-1819 Update Makefile for native map to build on new OSX version

2013-10-27 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT 9f8632099 - 60609f341 ACCUMULO-1819 Update Makefile for native map to build on new OSX version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0e882211 Tree:

git commit: ACCUMULO-1819 Screwed up the merge conflict

2013-10-27 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT 60609f341 - 090a8cf68 ACCUMULO-1819 Screwed up the merge conflict Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/090a8cf6 Tree:

[3/5] git commit: Merge branch '1.5.1-SNAPSHOT'

2013-10-27 Thread elserj
Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bbaf3f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bbaf3f93 Diff:

[2/5] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-10-27 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: server/src/main/c++/nativeMap/Makefile Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60609f34 Tree:

[4/5] git commit: ACCUMULO-1819 Screwed up the merge conflict

2013-10-27 Thread elserj
ACCUMULO-1819 Screwed up the merge conflict Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/090a8cf6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/090a8cf6 Diff:

[5/5] git commit: Merge branch '1.5.1-SNAPSHOT'

2013-10-27 Thread elserj
Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2505f7a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2505f7a8 Diff: