Ben Steffensmeier
1e8b99a544
Issue #2107 Fix sampling of grid vector arrows.
...
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721
Former-commit-id: b1cb837528
[formerly fb1a0a203a
] [formerly 767915b318
] [formerly b1cb837528
[formerly fb1a0a203a
] [formerly 767915b318
] [formerly 4a25b32919
[formerly 767915b318
[formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]]]]
Former-commit-id: 4a25b32919
Former-commit-id: f2777babaf
[formerly a82bb6e999
] [formerly 61ef9e737b64b455fe0c36337caebc3edabe3d2d [formerly abedf0f23a
]]
Former-commit-id: 787307082d8bdff26dc28ad3d4ee49ab4a584b64 [formerly 5b68e9d57c
]
Former-commit-id: e6b5f4f6a6
2013-07-15 15:51:41 -05:00
Greg Armendariz
df73c0e2e9
13.5.1-6 baseline
...
Former-commit-id: e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 7e09fa5a0b
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977
[formerly 93b71934c0
] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7
]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d
]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
7b48c5038a
Issue #1869 Switch location hibernate type to use hibernate spatial.
...
Former-commit-id: 9d1910ba9d
[formerly f8596f1f5a
] [formerly 7a31fbb386
] [formerly 9d1910ba9d
[formerly f8596f1f5a
] [formerly 7a31fbb386
] [formerly bbdd5cdc79
[formerly 7a31fbb386
[formerly b434131d412788c478ec45114a86abe925a79d4c]]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: 87cc8f9112
[formerly a524c3f17d
] [formerly 4c381305878cb140792b9d6b0b8239024c1f483f [formerly d0b0d981cc
]]
Former-commit-id: abce4baedd0fd36fcdcf80fdb8b4981ea85727b7 [formerly db54975911
]
Former-commit-id: c02d27fe9e
2013-07-09 18:25:11 -05:00
Dustin Johnson
e46cb588f2
Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it
...
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8
Former-commit-id: 215e3fbd8d
[formerly 2cfe1506a4
] [formerly 0393cec5d5
] [formerly 215e3fbd8d
[formerly 2cfe1506a4
] [formerly 0393cec5d5
] [formerly 9f6bd8b32b
[formerly 0393cec5d5
[formerly 198c9895608d22b3e3a616f2812628be32da514b]]]]
Former-commit-id: 9f6bd8b32b
Former-commit-id: d506f63c65
[formerly 617fdd6b44
] [formerly d307875965a1a0d3fecaaf627504cf76ab5c4496 [formerly 3cb8e1336c
]]
Former-commit-id: 8c41760d6ddca7ab7a22a2d092e358ead6a94526 [formerly b9f992626c
]
Former-commit-id: 06ce541b67
2013-07-09 14:55:22 -05:00
Ben Steffensmeier
b6764e390e
Issue #1869 Format Calendar when making Constraint Mapping.
...
Former-commit-id: bbea2d76c5
[formerly 2cccbc8e0d
] [formerly f53f702b9e
] [formerly bbea2d76c5
[formerly 2cccbc8e0d
] [formerly f53f702b9e
] [formerly c3f48bac0a
[formerly f53f702b9e
[formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]]]
Former-commit-id: c3f48bac0a
Former-commit-id: 3555a55bda
[formerly 4bdec4b2bb
] [formerly efa98dc017879571de4c3992f60b9a80924bd274 [formerly 1017dfae5b
]]
Former-commit-id: 028655e89b75a3bb704036327e99d1ed4a519937 [formerly 236ec98da1
]
Former-commit-id: 364a7ec1b6
2013-07-09 14:01:13 -05:00
Brad Gonzales
86569acffd
Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
...
Amend: Update from peer review.
Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd
Former-commit-id: cc89d3939d
[formerly 2ced007de9
] [formerly b462162996
] [formerly cc89d3939d
[formerly 2ced007de9
] [formerly b462162996
] [formerly 503d6d6cca
[formerly b462162996
[formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 2a3706a8f1
[formerly 222965ca7f
] [formerly ece70e73a38f366159776702fbedeee0c1c366ee [formerly 4f80abebaa
]]
Former-commit-id: 84d33297e2e3c72a87a8cbf7c52ee2f49f1d1d66 [formerly 6de2098f63
]
Former-commit-id: 1405b1f061
2013-07-09 09:07:38 -05:00
Bryan Kowal
66be02b953
Issue #2153 - fix commons-logging dependencies for wes2bridge
...
Former-commit-id: a9f9517cfc
[formerly 8485164fa2
] [formerly 650509604a
] [formerly a9f9517cfc
[formerly 8485164fa2
] [formerly 650509604a
] [formerly c3a87eadea
[formerly 650509604a
[formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]]
Former-commit-id: c3a87eadea
Former-commit-id: a5d925cf35
[formerly bdabcac203
] [formerly 7544cc885821cce005f9f789f2f8be15b1c17560 [formerly 2dc96499d0
]]
Former-commit-id: 9d0ccc0282df419cdba68586b88024f8b87a7069 [formerly b3a93df1df
]
Former-commit-id: 259a7d99b1
2013-07-08 20:14:11 -05:00
Ben Steffensmeier
f23a0b83b6
Issue #1869 Fix goes sounding updates.
...
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80
Former-commit-id: 4f6bd4efc3
[formerly 309624cb7b
] [formerly dbe74b56e5
] [formerly 4f6bd4efc3
[formerly 309624cb7b
] [formerly dbe74b56e5
] [formerly 21abe429ec
[formerly dbe74b56e5
[formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]]]
Former-commit-id: 21abe429ec
Former-commit-id: be1edd618a
[formerly 0b9c18aa23
] [formerly e8ccecad63676e5cbd08522fca1e434bdfd7efdc [formerly e92d1e9cad
]]
Former-commit-id: a132328ae92b20ca4260cd587a4b886795dc5001 [formerly c74c93af71
]
Former-commit-id: 812a14c5cc
2013-07-08 11:47:08 -05:00
Greg Armendariz
5e1549062b
13.5.1-5 baseline
...
Former-commit-id: ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ea7ac37930
[formerly 492f92ef7b
[formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06
[formerly d899faec3d
] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82
]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8
]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Bryan Kowal
36e343f8ab
Issue #2153 - 13.5.1 build update
...
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05
Former-commit-id: 4dfb37f2df
[formerly 2e46748156
] [formerly 6a6cdd7f6d
] [formerly 4dfb37f2df
[formerly 2e46748156
] [formerly 6a6cdd7f6d
] [formerly dc177c90d1
[formerly 6a6cdd7f6d
[formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]]]]
Former-commit-id: dc177c90d1
Former-commit-id: ba832ceb8a
[formerly 94ecc8119c
] [formerly 584813a4d670c8624b18ce891479c0cda0c9e5b8 [formerly 6bbe51aca9
]]
Former-commit-id: c0242fd39084238abee13b55dd209e917f143ff7 [formerly a89ff261d0
]
Former-commit-id: c0905c536e
2013-07-02 16:12:06 -05:00
Roger Ferrel
9eb3cffa65
Issue #1964 clean up of features and manifest.
...
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548
Former-commit-id: 559a54ea8f
[formerly 3c31d8c2ac
] [formerly 41c46e14c0
] [formerly 559a54ea8f
[formerly 3c31d8c2ac
] [formerly 41c46e14c0
] [formerly 7d3362d2b5
[formerly 41c46e14c0
[formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 56b1a0713c
[formerly b3437266d7
] [formerly 8c2a8d0c95f2cee23027bf633469a1a45f0b1e94 [formerly 201e62a4ad
]]
Former-commit-id: ead9e92b266c6bc5d2a1e8b5c9c7e8b4d7cb051d [formerly ea00a52ebe
]
Former-commit-id: 1d3ee09895
2013-07-02 11:14:56 -05:00
Nate Jensen
42a50bee52
Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
...
Former-commit-id: 4918ff844f
[formerly c68cf47883
] [formerly e4955f094c
] [formerly 4918ff844f
[formerly c68cf47883
] [formerly e4955f094c
] [formerly 01efa33cb9
[formerly e4955f094c
[formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]]
Former-commit-id: 01efa33cb9
Former-commit-id: 5784cf98aa
[formerly 058e47192a
] [formerly b78d9642086e4dba406ba61967972b761bb20b75 [formerly 150203f5cc
]]
Former-commit-id: 72adc28e1298571758c3c5e67205ef8cc350aa68 [formerly d288dded44
]
Former-commit-id: 6c95177bdf
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
596ffc3b12
Issue #2139 Loaded maps at cave start up.
...
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1
Former-commit-id: bbd2a9e5ab
[formerly 58fcc4c896
] [formerly a2328f0e06
] [formerly bbd2a9e5ab
[formerly 58fcc4c896
] [formerly a2328f0e06
] [formerly de24b8b431
[formerly a2328f0e06
[formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]]
Former-commit-id: de24b8b431
Former-commit-id: 767a7dd7d9
[formerly ab2e2f9a17
] [formerly 092389edf48fb57d0afab52fb91a50a27f6e805d [formerly 4e1b0674e4
]]
Former-commit-id: 549f5c664b546ffc489f5a28b764ce64bd4be1a4 [formerly 5431e5915d
]
Former-commit-id: 28849d2a53
2013-07-02 11:04:26 -05:00
Roger Ferrel
d19356f2f7
Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
...
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9
Former-commit-id: 50d0a74305
[formerly 82b1712714
] [formerly c3ebc0cc1c
] [formerly 50d0a74305
[formerly 82b1712714
] [formerly c3ebc0cc1c
] [formerly 68be9bd65f
[formerly c3ebc0cc1c
[formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]]
Former-commit-id: 68be9bd65f
Former-commit-id: 4983001f68
[formerly ff84f293fd
] [formerly 7f4689f8c48052cf1d41fa2ab3c0f6db2685a931 [formerly 933009605a
]]
Former-commit-id: f6a150ac8b1ba5cebfcf55c2645b0e107c8a7b4f [formerly 68c22b7073
]
Former-commit-id: 5eee41410c
2013-07-01 15:45:14 -05:00
Nate Jensen
dbd11273bf
Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
...
Former-commit-id: 5b1d7fe401
[formerly b23dcab913
] [formerly f7e743f388
] [formerly 5b1d7fe401
[formerly b23dcab913
] [formerly f7e743f388
] [formerly 001fba449f
[formerly f7e743f388
[formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]]
Former-commit-id: 001fba449f
Former-commit-id: c4edde79f5
[formerly 47d3441930
] [formerly 27c725fc1f0951e0a75e945562aeea6cde35b4e0 [formerly 0cb9726554
]]
Former-commit-id: 941bfb793aefcad79ab62db8cb3d7c09c08c774b [formerly 57d1375eed
]
Former-commit-id: 89f8162e2b
2013-07-01 11:29:47 -05:00
Bryan Kowal
0a131779fb
Issue #2153 - fix merge issue for build
...
Former-commit-id: eea749f828
[formerly 756fb4be59
] [formerly f052982f8e
] [formerly eea749f828
[formerly 756fb4be59
] [formerly f052982f8e
] [formerly 9c1aaa2bf5
[formerly f052982f8e
[formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 1862ecd1a4
[formerly 08bb604ced
] [formerly e6a347b2367d1c71b4d63cde07a471e571140e2f [formerly 37a5eb6c69
]]
Former-commit-id: 6bb6713c6e6a75bf3d32f621f86e2d748d7f82f9 [formerly e6516def2a
]
Former-commit-id: 29f21e56ee
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
9ab3a75c3b
Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
...
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14
] [formerly 2d4a32ca64
[formerly ab8acf06e1
] [formerly 81aad09d06
] [formerly 2d4a32ca64
[formerly ab8acf06e1
] [formerly 81aad09d06
] [formerly e4c0188c14
[formerly 81aad09d06
[formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]]].
Former-commit-id: 772bf31dd0
[formerly 70ab67c3e5
] [formerly c883b4e636
] [formerly 772bf31dd0
[formerly 70ab67c3e5
] [formerly c883b4e636
] [formerly 7f74926bb4
[formerly c883b4e636
[formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]]
Former-commit-id: 7f74926bb4
Former-commit-id: 5794a0bc3f
[formerly fa0887429d
] [formerly 112930e6b78a31053cde5b486cd3ccabf8fe7fbb [formerly 41e94abee3
]]
Former-commit-id: 65fd0b4e49c824f0bc4cff2669cc7a364faee3ef [formerly a08032627c
]
Former-commit-id: 23fe9db31b
2013-07-01 10:40:48 -05:00
Richard Peter
6434a4025d
Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
edexOsgi/com.raytheon.uf.common.archive/build.properties
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java
Former-commit-id: 4ee66ab1f0
[formerly da54766cc8
] [formerly 53258be797
] [formerly 4ee66ab1f0
[formerly da54766cc8
] [formerly 53258be797
] [formerly 582f38bdd4
[formerly 53258be797
[formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 0da7509e6d
[formerly 69f8807963
] [formerly ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee
]]
Former-commit-id: 1478532c079d144368b91a4562993c9aac0b7cd4 [formerly 7ceb1bb9ab
]
Former-commit-id: da3eb1e75c
2013-06-30 23:46:32 -05:00
Brad Gonzales
7c8f8a018c
Issue #1965 added edex archive to the build.edex build.xml.
...
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b
Former-commit-id: f95cf443d5
[formerly 2d1c6a0ec5
] [formerly ba661b9e39
] [formerly f95cf443d5
[formerly 2d1c6a0ec5
] [formerly ba661b9e39
] [formerly add108398a
[formerly ba661b9e39
[formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]]
Former-commit-id: add108398a
Former-commit-id: fb8caf6e22
[formerly bc766efb7a
] [formerly 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3
]]
Former-commit-id: 795e5b8c49c2e0a6a652dcc5f274ef5fb1e2f348 [formerly c4daf04c32
]
Former-commit-id: 245de9c408
2013-06-28 13:25:46 -05:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901
[formerly 640b022e84
] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357
]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922
]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Brad Gonzales
8e22010180
Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
...
Amend: Added archive feature to the viz product build.
Added archive feature to the viz developer product.
Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07
Former-commit-id: aca1486801
[formerly 65507d4424
] [formerly c28d1e5d4d
] [formerly aca1486801
[formerly 65507d4424
] [formerly c28d1e5d4d
] [formerly f4bb78381c
[formerly c28d1e5d4d
[formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]]
Former-commit-id: f4bb78381c
Former-commit-id: 1c6ca60919
[formerly 6e99019a25
] [formerly 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0
]]
Former-commit-id: 41beba358fca549dca62c32eff3862ee1f765033 [formerly f51c74e2d4
]
Former-commit-id: 33dc495040
2013-06-27 17:40:07 -05:00
Brad Gonzales
d706ff2334
Issue #1965 added File filtering by file date extension in archive purge.
...
Amend: updated purge cron time to once every hour.
moved archive.purge.cron to cron.properties.
removed purge code from DataArchiver.
added back isHoursToKeep in DataArchiver.
updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
updates from peer review.
updated test cases to work with Roger's refactoring.
fixes for ArchiveConfigManager createArchive.
clean up of ArchiveConfigManager purgeFile.
Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519
Former-commit-id: 90f363d722
[formerly 67b4a2e202
] [formerly 137c66539e
] [formerly 90f363d722
[formerly 67b4a2e202
] [formerly 137c66539e
] [formerly 276f05233f
[formerly 137c66539e
[formerly 2094b7f9fde97873c759da217498bcf62254a287]]]]
Former-commit-id: 276f05233f
Former-commit-id: df7670676b
[formerly d6fb315096
] [formerly ca13651aece598f209306490fbd73fd98936b032 [formerly 4f54596904
]]
Former-commit-id: 450a3eb9f6de7a580368b452e78efb57b1066c68 [formerly d047e6a137
]
Former-commit-id: 9a5c3e259d
2013-06-27 11:46:44 -05:00
Roger Ferrel
667104c43e
Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
...
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3
Former-commit-id: 713f39c429
[formerly 6f07f6f3bd
] [formerly ee409c0819
] [formerly 713f39c429
[formerly 6f07f6f3bd
] [formerly ee409c0819
] [formerly f66681f62b
[formerly ee409c0819
[formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]]
Former-commit-id: f66681f62b
Former-commit-id: 79c0bbb140
[formerly 5f35643c2d
] [formerly 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8
]]
Former-commit-id: d681469cf5de2614b883cebf316eab2fd929d808 [formerly bec6928ea9
]
Former-commit-id: 6261e65829
2013-06-27 07:51:56 -05:00
Richard Peter
fa3b24f01c
Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
...
Former-commit-id: 45956fdcaa
[formerly e3886246fd
] [formerly 3a3dc3d208
] [formerly 45956fdcaa
[formerly e3886246fd
] [formerly 3a3dc3d208
] [formerly 67d052307c
[formerly 3a3dc3d208
[formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]]
Former-commit-id: 67d052307c
Former-commit-id: 59789a3885
[formerly 1b00dd48ec
] [formerly 705e64d8c7547f55a4b9ebb9c95b3b9faf82cc18 [formerly 208b01a167
]]
Former-commit-id: 95025b5bae17b8047a17d9fcfad27a79cc831d65 [formerly 575405b14e
]
Former-commit-id: 2952f2b56d
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
5c0ec55d70
Issue #1869 Fix plot sampling.
...
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b
Former-commit-id: 9e23a71d84
[formerly 570da6f0d5
] [formerly 8c14a34f46
] [formerly 9e23a71d84
[formerly 570da6f0d5
] [formerly 8c14a34f46
] [formerly 6db28c32a5
[formerly 8c14a34f46
[formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 9906f30ff0
[formerly 2ce266f7e7
] [formerly b33a1c795a47c684e688769e932048e39d11d241 [formerly f26a72afe9
]]
Former-commit-id: cfbc87543d974e56cf4a0535842654c9970b1607 [formerly 0d2f556144
]
Former-commit-id: 6cb77b1793
2013-06-26 13:24:13 -05:00
Nate Jensen
108c9173d2
Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
...
Former-commit-id: 9282a3be3b
[formerly 8cc7eefd84
] [formerly a60afe6640
] [formerly 9282a3be3b
[formerly 8cc7eefd84
] [formerly a60afe6640
] [formerly 10baafed63
[formerly a60afe6640
[formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]]
Former-commit-id: 10baafed63
Former-commit-id: a56dc79f87
[formerly 9374463bac
] [formerly 81b3d5ac13949746ea2fab31914ba17a9472bd55 [formerly 214fd8689c
]]
Former-commit-id: 2caa259af186898c4d7b26d87c908e624f2ee4d1 [formerly b4c6a79741
]
Former-commit-id: 586cb967aa
2013-06-26 11:14:03 -05:00
Jonathan Sanchez
bac226cd75
Issue #2139 Run async job for loading maps in warngen.
...
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a
Former-commit-id: 2d4a32ca64
[formerly ab8acf06e1
] [formerly 81aad09d06
] [formerly 2d4a32ca64
[formerly ab8acf06e1
] [formerly 81aad09d06
] [formerly e4c0188c14
[formerly 81aad09d06
[formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]]
Former-commit-id: e4c0188c14
Former-commit-id: 7ed0d5d135
[formerly d1b63b5a25
] [formerly a650d8102fed57108c8af5d7126de91df9a6a09e [formerly 47505aa013
]]
Former-commit-id: dc4478db01003cbe90992e2c578d4616e0adf4d1 [formerly c4ce4831c2
]
Former-commit-id: acad56f72b
2013-06-25 15:29:08 -05:00
Roger Ferrel
2033689544
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 89d4d0e00f
[formerly 1e5d68fa1b
] [formerly 2cfff5c563
] [formerly 89d4d0e00f
[formerly 1e5d68fa1b
] [formerly 2cfff5c563
] [formerly c10f5c8d65
[formerly 2cfff5c563
[formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 4b10182a2e
[formerly 318de198e5
] [formerly d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c
]]
Former-commit-id: 1a640f5700b34cc1839d0294b48e0f419bc80aa2 [formerly b681d07346
]
Former-commit-id: 3419cbaddd
2013-06-25 13:44:30 -05:00
Richard Peter
7ef16a186e
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly 37645245e5
[formerly 744eb64856
[formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7
[formerly be094a1745
] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93
]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50
]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly 72d22a30c9
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0
[formerly deebdb874a
] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a
]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5
]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Dustin Johnson
a7a5ea4b35
Issue #1802 Fix event processing in regards to transaction commits/rollbacks
...
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22
Former-commit-id: de8c9a4915
[formerly a606508cd4
] [formerly ecae75ecd8
] [formerly de8c9a4915
[formerly a606508cd4
] [formerly ecae75ecd8
] [formerly a331cd2958
[formerly ecae75ecd8
[formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]]
Former-commit-id: a331cd2958
Former-commit-id: bf2f6eebd8
[formerly cf36003f12
] [formerly b97c78d83811f1218347ce87ea5843be3bb4e72f [formerly d2faa3b600
]]
Former-commit-id: 1c8ca91ae0182e9e685222962120c92d3ee918d3 [formerly 87e4d9269d
]
Former-commit-id: a6c7287a74
2013-06-20 13:53:04 -05:00
Ben Steffensmeier
b7641bec29
Issue #2128 ensure setDataURI sets the dataURI.
...
Former-commit-id: 2598b08d69
[formerly b507b6b1fd
] [formerly f02b073cc8
] [formerly 2598b08d69
[formerly b507b6b1fd
] [formerly f02b073cc8
] [formerly 68bb07f5fa
[formerly f02b073cc8
[formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]]]
Former-commit-id: 68bb07f5fa
Former-commit-id: f318fef863
[formerly 38f7211e99
] [formerly 8ff11c8549d6d75928d3a0627db7abad67a6caeb [formerly 69f1d9d812
]]
Former-commit-id: 60dc08c76a62e06ee1c86fc7361c9cd7ceb55e9b [formerly be0c2f2a6f
]
Former-commit-id: 6a500f68ab
2013-06-20 11:11:37 -05:00
Lee Venable
ca1558ac7e
Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1
...
Former-commit-id: 670d9b5075
[formerly 3248909c85
] [formerly 377bc28f63
] [formerly 670d9b5075
[formerly 3248909c85
] [formerly 377bc28f63
] [formerly 8b92b564d5
[formerly 377bc28f63
[formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]]]
Former-commit-id: 8b92b564d5
Former-commit-id: cf1e74a595
[formerly 953ad96305
] [formerly b4acc7f410ff3f6a737ded588bea0faa15fb5d0d [formerly 9b564bef6a
]]
Former-commit-id: a8418de0d5c5a351fcb0ad3edcd3b8e1c1cb58d5 [formerly ae73cbab32
]
Former-commit-id: 6a4d6fb933
2013-06-20 09:22:36 -05:00
Nate Jensen
c3fd1acd1d
Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1
...
Former-commit-id: b7595c5585
[formerly a029fa7e57
] [formerly b7b2602271
] [formerly b7595c5585
[formerly a029fa7e57
] [formerly b7b2602271
] [formerly ba5c49fa61
[formerly b7b2602271
[formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]]]
Former-commit-id: ba5c49fa61
Former-commit-id: de165ee20d
[formerly d1b3b0f000
] [formerly 9f7706231284ee0f073c332e0ac7215f4fccabda [formerly 622e1298d2
]]
Former-commit-id: 5d4a07f7fe937e4885f989edf51acfe3232a8552 [formerly 65157cd1de
]
Former-commit-id: 9e333d9988
2013-06-19 17:45:41 -05:00
Richard Peter
f26801db83
Merge "Issue #1966 Check for modifications on close." into omaha_13.5.1
...
Former-commit-id: 373e26a000
[formerly c75874364d
] [formerly 36ed7d5d2b
] [formerly 373e26a000
[formerly c75874364d
] [formerly 36ed7d5d2b
] [formerly 1fd38812ec
[formerly 36ed7d5d2b
[formerly 3c19aebeb235e8bf24e286007b27d5e8263731c6]]]]
Former-commit-id: 1fd38812ec
Former-commit-id: 06067183aa
[formerly bfd5e0929a
] [formerly d575f325c1eebbe00ac2c72d42d660ec6e0518c0 [formerly fd3cdedf8e
]]
Former-commit-id: 418bd75cf9f26fe248371e431cde15660b7808aa [formerly 71e960607d
]
Former-commit-id: bd9cf3c849
2013-06-19 16:41:27 -05:00
Ben Steffensmeier
8f2c67ff5e
Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective.
...
Former-commit-id: eead580673
[formerly f238131378
] [formerly 0e6f3ff5e6
] [formerly eead580673
[formerly f238131378
] [formerly 0e6f3ff5e6
] [formerly 6de9e86090
[formerly 0e6f3ff5e6
[formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]]]
Former-commit-id: 6de9e86090
Former-commit-id: 425b7fe5cf
[formerly deacc7c250
] [formerly 85486ff0e42f1d7272e505367f9cc70208606f83 [formerly accd308f8b
]]
Former-commit-id: 264445e3ba0817e5d35af1eb98386e5ece0e3409 [formerly fa9d23798e
]
Former-commit-id: c5567fa3d5
2013-06-19 16:35:41 -05:00
Roger Ferrel
2bcd240aa6
Issue #2119 Added check when no selected lid.
...
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac
Former-commit-id: d51a814661
[formerly 541b7fbc93
] [formerly dc5059f06b
] [formerly d51a814661
[formerly 541b7fbc93
] [formerly dc5059f06b
] [formerly e7dc1184b1
[formerly dc5059f06b
[formerly 4a64a5b44a05a1c91b9a3d878ea0806e68c6d788]]]]
Former-commit-id: e7dc1184b1
Former-commit-id: cf93642522
[formerly dc0e31fcdd
] [formerly 380574ff84e4b34490a9b8f156b0d737799375d7 [formerly 440ea0fc25
]]
Former-commit-id: aa07129556c9376313a7c76c0027bbc693ca90ed [formerly c549efa0c1
]
Former-commit-id: a4bee23421
2013-06-19 16:25:01 -05:00
Roger Ferrel
d0d18ff416
Issue #2110 RequestRouter.route(req) changed the class returned.
...
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f
Former-commit-id: 90c20a0418
[formerly c6b4424fb7
] [formerly f3a1c68d40
] [formerly 90c20a0418
[formerly c6b4424fb7
] [formerly f3a1c68d40
] [formerly 4443dfd11a
[formerly f3a1c68d40
[formerly cda40b66492abf6a0064d28484b03e05500f7bed]]]]
Former-commit-id: 4443dfd11a
Former-commit-id: fef68ac4b6
[formerly a2db3ff22c
] [formerly 2863f767cd091957133e715c06b8ee4a29858c9f [formerly 7c7b1264d1
]]
Former-commit-id: 46f8cb0d6c54c9eae1050b250fb0be417939df13 [formerly b9244cb214
]
Former-commit-id: 83081bebe2
2013-06-19 11:25:55 -05:00
Roger Ferrel
eeae10dc22
Issue #1966 Check for modifications on close.
...
Change-Id: I88b17fb6406fd41ede46085a7a6b40149a387e83
Former-commit-id: fdc6f689af
[formerly 85d7e4aab9
] [formerly 784a56f2ce
] [formerly fdc6f689af
[formerly 85d7e4aab9
] [formerly 784a56f2ce
] [formerly 67362de877
[formerly 784a56f2ce
[formerly f6e51deb6cf7f50be7638b4670131cf39976944c]]]]
Former-commit-id: 67362de877
Former-commit-id: 4fdbc6ba95
[formerly 745c114b45
] [formerly 195431f0a85b63a953d0d167b451e430eaaac44f [formerly 259a66ac85
]]
Former-commit-id: 5f660b3f14296c3858875492bea0a6b30a8783bb [formerly 301fdd43ae
]
Former-commit-id: d1a7d41ec7
2013-06-19 11:09:44 -05:00
Nate Jensen
d2ef59e9ad
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
...
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: 5eef22fd4d
[formerly c0f95eb55a
] [formerly 81fc4fa753
] [formerly 5eef22fd4d
[formerly c0f95eb55a
] [formerly 81fc4fa753
] [formerly c4283b0336
[formerly 81fc4fa753
[formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]]
Former-commit-id: c4283b0336
Former-commit-id: ff64bf589b
[formerly afae330d8a
] [formerly 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9
]]
Former-commit-id: 9cbc7ddc24e78fbf205d00560788cdfa1249462a [formerly 73c0514c3d
]
Former-commit-id: 8091cae89d
2013-06-19 10:16:06 -05:00
Dustin Johnson
7ca11e99a7
Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
...
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576
Former-commit-id: 89a179ab97
[formerly 1e7c85a592
] [formerly 6f8246262b
] [formerly 89a179ab97
[formerly 1e7c85a592
] [formerly 6f8246262b
] [formerly 314331c9a4
[formerly 6f8246262b
[formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]]]
Former-commit-id: 314331c9a4
Former-commit-id: 27a2717d88
[formerly a0d8e1dc0c
] [formerly cb5dabe6a8d083d3beec439c06b863290f719aae [formerly dab308afc8
]]
Former-commit-id: 75782b08f3a19e106f39a37de8b9fcb471f64c5c [formerly aa2c2516ee
]
Former-commit-id: 89d5b4327d
2013-06-19 08:56:43 -05:00
Dustin Johnson
eb194fb644
Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
...
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7
Former-commit-id: e8511a53ad
[formerly b9d8e444b3
] [formerly 9bc7c854ab
] [formerly e8511a53ad
[formerly b9d8e444b3
] [formerly 9bc7c854ab
] [formerly 7ee918a548
[formerly 9bc7c854ab
[formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]]
Former-commit-id: 7ee918a548
Former-commit-id: 73e70fe69a
[formerly e7a679ebc7
] [formerly 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2
]]
Former-commit-id: 3a585d939f08c5550919df20ddfa5031fa2b67c5 [formerly cd12316060
]
Former-commit-id: b0c2c25598
2013-06-18 12:34:25 -05:00
Roger Ferrel
46dbde3b3d
Issue #1966 Column sort added; bug fixes to size estimates and saving files.
...
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa
Former-commit-id: 9fd68957ab
[formerly e16bfeee80
] [formerly f175b19a93
] [formerly 9fd68957ab
[formerly e16bfeee80
] [formerly f175b19a93
] [formerly c7c27c4cbb
[formerly f175b19a93
[formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: 5153afecf9
[formerly 28342fdfed
] [formerly d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044
]]
Former-commit-id: 712d918bdb6f38e7adc7a9acffe6b62216ccd456 [formerly 2b36404b6c
]
Former-commit-id: 0899652c38
2013-06-18 08:56:54 -05:00
Richard Peter
492da0baa1
Issue #1977 : Fix merge, remove duplicate method alterProductParameters
...
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2
Former-commit-id: 562c5668d4
[formerly 9d90349767
] [formerly 9b8ef83ccb
] [formerly 562c5668d4
[formerly 9d90349767
] [formerly 9b8ef83ccb
] [formerly 9f7739c7d5
[formerly 9b8ef83ccb
[formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 2c40188746
[formerly 843cf307e8
] [formerly 814dfc90273c6dcf86036dd288da3357cb7bdf37 [formerly 1d706b3b72
]]
Former-commit-id: d04dc69e11ddb3947c29a97b0e31080a02df9d63 [formerly 95bf734600
]
Former-commit-id: 92a9bf5677
2013-06-17 19:01:20 -05:00
Bryan Kowal
45515a8bca
Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
...
Former-commit-id: cb6073c9b1
[formerly 7739797147
] [formerly cddb77b77b
] [formerly cb6073c9b1
[formerly 7739797147
] [formerly cddb77b77b
] [formerly 6d58e92913
[formerly cddb77b77b
[formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]]]
Former-commit-id: 6d58e92913
Former-commit-id: f842640027
[formerly 5bb6ea92a7
] [formerly b65959681050b87644d70259b84677f21ae907a1 [formerly 8f6b0fef1a
]]
Former-commit-id: 3a4321abbfeee546b3aa0dcc6b645a59e993f8df [formerly fcaf57d316
]
Former-commit-id: 6577b77663
2013-06-17 15:46:23 -05:00
Steve Harris
173bcd08e1
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Conflicts (self-resolved with kdiff3):
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
Former-commit-id: dadf03acaf
[formerly 41748175b6
] [formerly 97631f9c62
] [formerly dadf03acaf
[formerly 41748175b6
] [formerly 97631f9c62
] [formerly 40359c27c3
[formerly 97631f9c62
[formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d
[formerly 0e4504c0fa
] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea
]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493
]
Former-commit-id: c27136275f
2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4
13.5.1-2 baseline
...
Former-commit-id: 7fe15db2f8
[formerly bc60b22f00
] [formerly adb779323d
] [formerly 7fe15db2f8
[formerly bc60b22f00
] [formerly adb779323d
] [formerly 3386330894
[formerly adb779323d
[formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab
[formerly ccd66c0724
] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7
]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de
]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Dustin Johnson
c9554a7ba8
Merge "Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp" into omaha_13.5.1
...
Former-commit-id: 0467ee92a1
[formerly 73ec15180f
] [formerly 4b387ae85b
] [formerly 0467ee92a1
[formerly 73ec15180f
] [formerly 4b387ae85b
] [formerly 46914a095c
[formerly 4b387ae85b
[formerly 8418598ba30fa601b13bbe435618acc1a6d152c2]]]]
Former-commit-id: 46914a095c
Former-commit-id: 031c34bec6
[formerly 2c54620889
] [formerly 8efbe5f91e31b8bce57477835bee965b61c3dc3c [formerly 0e7a34ce2a
]]
Former-commit-id: ef63ca0d3ff0c38d89fa8ad676a9ef5b72636429 [formerly f01a1cee02
]
Former-commit-id: 8e9e3fe314
2013-06-17 13:19:09 -05:00
Mike Duff
ee068723bf
Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp
...
Former-commit-id: 9d7301a79b
[formerly 66d564dc43
] [formerly 2fa207f744
] [formerly 9d7301a79b
[formerly 66d564dc43
] [formerly 2fa207f744
] [formerly e51778ae88
[formerly 2fa207f744
[formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]]]
Former-commit-id: e51778ae88
Former-commit-id: 67bcce082e
[formerly 365d4be785
] [formerly cd6a8799b4b0cbd779a9fd3e000860daf3b3c1b9 [formerly 5c58b973ab
]]
Former-commit-id: 308e6c152ed4cec8afcedfa75301926c70258711 [formerly 069d2134e2
]
Former-commit-id: 1c50a0ecbf
2013-06-17 13:15:34 -05:00
Steve Harris
91340cc4cd
Issue #1977 - removed i386-pc-linux-gnu.tar (should have stayed removed since 13.4.1)
...
Former-commit-id: f66cbdbd97
[formerly 6fe7610162
] [formerly 477a86934c
] [formerly f66cbdbd97
[formerly 6fe7610162
] [formerly 477a86934c
] [formerly c5c8b4a121
[formerly 477a86934c
[formerly 1ce91abc2a3e4d12464e905e1d98ec4eb2179ca6]]]]
Former-commit-id: c5c8b4a121
Former-commit-id: 432129114e
[formerly 9f7e1049c9
] [formerly 4ce3b8e910388f6db76d22549b666b5dbc95a68d [formerly eb16dd8a45
]]
Former-commit-id: 09da716c82d35694d87e67e3ec3633e7752a644e [formerly e2d464b2be
]
Former-commit-id: 7c7dc93b41
2013-06-17 12:53:03 -05:00