Merged develop branch.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/962badce Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/962badce Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/962badce Branch: refs/heads/ZEST-105 Commit: 962badcea188f48da722cba396fb2478375065e7 Parents: 5c1a400 2ae805e Author: Niclas Hedhman <[email protected]> Authored: Wed Apr 13 23:49:10 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Wed Apr 13 23:49:10 2016 +0800 ---------------------------------------------------------------------- build.gradle | 2 +- .../src/main/java/org/apache/zest/test/indexing/model/Address.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/962badce/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java ---------------------------------------------------------------------- diff --cc core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java index 1d5c03a,8de630a..60aa742 mode 100644,100755..100755 --- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java +++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java @@@ -20,7 -20,8 +20,7 @@@ package org.apache.zest.test.indexing.m import org.apache.zest.api.property.Property; import org.apache.zest.api.value.ValueComposite; --public interface Address - extends ValueComposite // necessary, @See ZEST-137 ++public interface Address extends ValueComposite // necessary, @See ZEST-137 { Property<String> line1();
