Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/metamodel.git
Conflicts:
CHANGES.md
Closes #96
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/025d07f0
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/025d07f0
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/025d07f0
Branch: refs/heads/master
Commit: 025d07f00cc54d63a7edf5cc41187a88b8ab3a81
Parents: cca0cba bf439b4
Author: kaspersorensen <i.am.kasper.soren...@gmail.com>
Authored: Tue Apr 26 12:47:08 2016 -0700
Committer: kaspersorensen <i.am.kasper.soren...@gmail.com>
Committed: Tue Apr 26 12:47:08 2016 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
.../metamodel/util/LegacyDeserializationObjectInputStream.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/025d07f0/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index ee40ff0,546f31c..4356071
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -2,7 -2,7 +2,8 @@@
* [METAMODEL-235] - Fixed a bug related to handling of null or missing
values in ElasticSearch using REST client.
* [METAMODEL-225] - Fixed support for nested objects and arrays in
ElasticSearch using REST client.
+ * [METAMODEL-244] - Added ColumnNamingStrategies concept which allows custom
column naming and column name overriding.
+ * [METAMODEL-242] - Fixed issue when de-serializing old enum-instances of
FunctionType.
### Apache MetaModel 4.5.2
