[yoda-svn] yoda: 3 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/85d1802307e6
branches:  release-1-5
changeset: 1264:85d1802307e6
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jun 06 13:44:54 2016 +0100
description:
Mark TODOs

details:   https://yoda.hepforge.org/hg/yoda/rev/908cd4db74ef
branches:  release-1-5
changeset: 1265:908cd4db74ef
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jun 06 13:54:47 2016 +0100
description:
Re-enable the disabled-for-some-reason Scatter1D combineWith Python mappings.

details:   https://yoda.hepforge.org/hg/yoda/rev/944fa23c1cf4
branches:  release-1-6
changeset: 1266:944fa23c1cf4
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jun 06 13:56:57 2016 +0100
description:
Merge from 1.5.x

diffs (truncated from 5930 to 50 lines):

--- a/.hgignore	Fri Apr 08 15:42:26 2016 +0100
+++ b/.hgignore	Mon Jun 06 13:56:57 2016 +0100
@@ -47,6 +47,8 @@
 ^test-driver$
 ^tests/.*\.(trs|log)$
 ^tests/test\.aida$
+^tests/testtraits$
+^tests/testwriter$
 ^tests/testhisto1Da$
 ^tests/testhisto1Db$
 ^tests/testhisto1Dcreate$
--- a/.hgtags	Fri Apr 08 15:42:26 2016 +0100
+++ b/.hgtags	Mon Jun 06 13:56:57 2016 +0100
@@ -32,3 +32,12 @@
 2a5c30e6fd751cdce59ac535dd54b4b499e92801 yoda-1.5.7
 7dfc1023d37c85d9fe55d91a1a082dc3f784f030 yoda-1.5.9
 f4f3465b93e36b574e98920114ee1293ea967ff1 yoda-1.5.8
+e6d259d62a233df2a71ec38995069b7cbd41a10f yoda-1.6.0beta1
+e6d259d62a233df2a71ec38995069b7cbd41a10f yoda-1.6.0beta1
+0000000000000000000000000000000000000000 yoda-1.6.0beta1
+0000000000000000000000000000000000000000 yoda-1.6.0beta1
+a1fbfd42fa562688b9843ab9a26f34b81bbe93e2 yoda-1.6.0beta1
+a1fbfd42fa562688b9843ab9a26f34b81bbe93e2 yoda-1.6.0beta1
+0000000000000000000000000000000000000000 yoda-1.6.0beta1
+a57d544b72714e45c3a7bcf408479473ec2481a7 yoda-1.6.0
+f27b8f2bddc522aaf30c06bb643207b67422fa9b yoda-1.6.1
--- a/ChangeLog	Fri Apr 08 15:42:26 2016 +0100
+++ b/ChangeLog	Mon Jun 06 13:56:57 2016 +0100
@@ -1,6 +1,49 @@
+2016-06-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Re-enable the disabled-for-some-reason Scatter1D combineWith Python mappings.
+
+2016-04-28  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Version 1.6.1 release!
+
+	* Add a unit test for annotation handling correctness.
+
+	* Fix numerical precision of string storage of floating-point attributes.
+
+	* Fix a bug in use of the replacement for lexical_cast.
+
+2016-04-20  Andy Buckley  <andy.buckley at cern.ch>
+
+
+	* Version 1.6.0 release!
+
+2016-04-16  Andy Buckley  <andy.buckley at cern.ch>
+