You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by kt...@apache.org on 2016/08/01 15:38:53 UTC
[2/2] incubator-fluo git commit: Merge branch 'fluo-740'
Merge branch 'fluo-740'
Closes apache/incubator-fluo#747
Conflicts:
modules/api/src/main/java/org/apache/fluo/api/data/RowColumnValue.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/54009717
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/54009717
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/54009717
Branch: refs/heads/master
Commit: 5400971748af8b771b4ef9b3d6e43ebd0502da95
Parents: 69f8369 61a43a7
Author: Keith Turner <kt...@apache.org>
Authored: Mon Aug 1 11:08:28 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Aug 1 11:08:28 2016 -0400
----------------------------------------------------------------------
.../api/src/main/java/org/apache/fluo/api/data/Column.java | 2 +-
.../src/main/java/org/apache/fluo/api/data/ColumnValue.java | 3 ++-
.../src/main/java/org/apache/fluo/api/data/RowColumn.java | 2 +-
.../src/test/java/org/apache/fluo/core/data/BytesTest.java | 8 ++++++++
.../test/java/org/apache/fluo/core/data/RowColumnTest.java | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/54009717/modules/api/src/main/java/org/apache/fluo/api/data/Column.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/54009717/modules/api/src/main/java/org/apache/fluo/api/data/ColumnValue.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/54009717/modules/api/src/main/java/org/apache/fluo/api/data/RowColumn.java
----------------------------------------------------------------------