Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf0b7f7
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 117dce765 -> d11acbe5d
refs/heads/1.5.2-SNAPSHOT 43cebf8c0 -> bf0b7f78b
refs/heads/1.6.0-SNAPSHOT c657c5758 -> 7ed250ab9
refs/heads/master 2368eef2f -> 28c23e6aa
ACCUMULO-2319 Move MemoryManagementFramework thread starts out
ACCUMULO-2319 Move MemoryManagementFramework thread starts out of constructor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d11acbe5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d11acbe5
Diff: http://git-
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ed250ab
Tr
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ed250ab
Tr
ACCUMULO-2319 Move MemoryManagementFramework thread starts out of constructor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d11acbe5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d11acbe5
Diff: http://git-
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf0b7f7
ACCUMULO-2319 Move MemoryManagementFramework thread starts out of constructor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d11acbe5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d11acbe5
Diff: http://git-
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/28c23e6a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28c23e6a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28c23e
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf0b7f7
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 6dd1bd3e9 -> c657c5758
refs/heads/master 20375b6b8 -> 2368eef2f
ACCUMULO-2444 unit tests for a.o.o.core.security
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accu
ACCUMULO-2444 unit tests for a.o.o.core.security
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c657c575
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c657c575
Diff: http://git-wip-us.apache.org/repos/asf/a
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2368eef2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2368eef2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2368ee
Author: bhavanki
Date: Wed Mar 12 17:36:48 2014
New Revision: 901299
Log:
Publishing svnmucc operation to accumulo site by bhavanki
Added:
websites/production/accumulo/content/
- copied from r901298, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/a
Author: buildbot
Date: Wed Mar 12 17:35:43 2014
New Revision: 901298
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/css/accumulo.css
Propchange: websites/staging/accumulo/trunk/cont
Author: bhavanki
Date: Wed Mar 12 17:35:36 2014
New Revision: 1576831
URL: http://svn.apache.org/r1576831
Log:
Differentiated h3 from h4 - h6
Modified:
accumulo/site/trunk/content/css/accumulo.css
Modified: accumulo/site/trunk/content/css/accumulo.css
URL:
http://svn.apache.org/viewvc/accum
Author: bhavanki
Date: Wed Mar 12 17:32:58 2014
New Revision: 1576830
URL: http://svn.apache.org/r1576830
Log:
Removed nested list in Public API section, doesn't render right
Modified:
accumulo/site/trunk/content/source.mdtext
Modified: accumulo/site/trunk/content/source.mdtext
URL:
http://
Author: buildbot
Date: Wed Mar 12 17:33:05 2014
New Revision: 901296
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/source.html
Propchange: websites/staging/accumulo/trunk/content/
Author: bhavanki
Date: Wed Mar 12 17:33:21 2014
New Revision: 901297
Log:
Publishing svnmucc operation to accumulo site by bhavanki
Added:
websites/production/accumulo/content/
- copied from r901296, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/a
Author: bhavanki
Date: Wed Mar 12 17:30:44 2014
New Revision: 1576829
URL: http://svn.apache.org/r1576829
Log:
Added public API definition based on README.
Modified:
accumulo/site/trunk/content/source.mdtext
Modified: accumulo/site/trunk/content/source.mdtext
URL:
http://svn.apache.org/view
Author: buildbot
Date: Wed Mar 12 17:30:56 2014
New Revision: 901295
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/source.html
Propchange: websites/staging/accumulo/trunk/content/
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20375b6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20375b6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20375b
Repository: accumulo
Updated Branches:
refs/heads/master a085d6233 -> 20375b6b8
ACCUMULO-2267 use the localhost convention for the tracer, too
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6dd1bd3e
Tree: http://git
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 09307322a -> 6dd1bd3e9
ACCUMULO-2267 use the localhost convention for the tracer, too
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6dd1bd3e
Tree: ht
24 matches
Mail list logo