Merge branch 'MLHR-1863' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/3d0166bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/3d0166bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/3d0166bf Branch: refs/heads/devel-3 Commit: 3d0166bfe3d6cce0ea6fbdac74d8ad7d06e95dad Parents: 873667b 28094b7 Author: Chandni Singh <[email protected]> Authored: Tue Sep 29 15:16:40 2015 -0700 Committer: Chandni Singh <[email protected]> Committed: Tue Sep 29 15:16:40 2015 -0700 ---------------------------------------------------------------------- .../lib/appdata/schemas/CustomTimeBucket.java | 13 +++++++- .../lib/appdata/schemas/TimeBucket.java | 16 ++++++++++ .../appdata/schemas/CustomTimeBucketTest.java | 18 +++++++++++ .../lib/appdata/schemas/TimeBucketTest.java | 33 ++++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
