Commit graph

3249 commits

Author SHA1 Message Date
Roger Ferrel
25ebc33066 Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b

Former-commit-id: 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 752933c7fe [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]]
Former-commit-id: 752933c7fe
Former-commit-id: 2f5994b297 [formerly 477d8b0317] [formerly 0187d6cc339bec8a38231e4fb72a3c74d9c45138 [formerly 3c24739b72]]
Former-commit-id: 68c6ec861090e911963c0c012b7fd34292902451 [formerly 0fb0ff7a5a]
Former-commit-id: 9f8b831148
2013-07-02 17:27:22 -05: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
Mike Duff
c14c159f24 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: a48d17ef7e [formerly 617abbd8f1] [formerly 9f07a473781aa8232e833e400eac68c9f1b191a5 [formerly 82d713083a]]
Former-commit-id: 55f66b799033e6ea0cc6b2f2e3796e34fc925ef8 [formerly 3e20961fe0]
Former-commit-id: c1abe64b72
2013-07-02 16:08:37 -05:00
Max Schenkelberg
5bc6ca2784 Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fef6056519 [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]]
Former-commit-id: fef6056519
Former-commit-id: 358ad28927 [formerly 63d69a5435] [formerly 41e73cad8a29f48a4d17728ff37661b0f76dc35e [formerly dc78010e74]]
Former-commit-id: cfc13968fb55ee8f651dcfb7836932ef8db807d9 [formerly 1e7b73c44e]
Former-commit-id: 738d6bcae8
2013-07-02 15:22:31 -05:00
Mike Duff
1f44740b1a Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: d82c72b52b [formerly cc4ac57b22] [formerly 655d9eb928] [formerly d82c72b52b [formerly cc4ac57b22] [formerly 655d9eb928] [formerly 5b676b122d [formerly 655d9eb928 [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]]]
Former-commit-id: 5b676b122d
Former-commit-id: d09183f6d7 [formerly 70d25a48dd] [formerly d2cd687662b0530ea34852c00595d332ebbac558 [formerly d87b4bceb5]]
Former-commit-id: c2bd273134c49b3513fb573f9ca09154edc327da [formerly c07d8ef10d]
Former-commit-id: afedebecd4
2013-07-02 12:31:10 -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
Richard Peter
4423b133b1 Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 45070c3a98 [formerly aef289d287] [formerly 63a1c03ad480f03852b9a9486718f0c5cb33e35e [formerly 8e15d6aa0a]]
Former-commit-id: 488563ebe4e4e1a36b6d505d074d0811c7a48b51 [formerly f916bba7ad]
Former-commit-id: 06ed1bc66c
2013-07-02 10:30:51 -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
4f6c84f9bb Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff [formerly 5a6b0f99cc] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519]
Former-commit-id: 86b096bc9b
2013-07-01 14:41:05 -05:00
Roger Ferrel
019989f5ee Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 220818df3a [formerly 1e7ae55676 [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]]]
Former-commit-id: 220818df3a
Former-commit-id: 97d130d022 [formerly ee5b120929] [formerly a92ee8e9a863e9b74742101f3ea578f6cb0c4219 [formerly 3cabedbd45]]
Former-commit-id: 115a4eef8bed57e9bdd3175321d311ae29f63f40 [formerly ac04c66be2]
Former-commit-id: d52ab020d1
2013-07-01 13:03:39 -05:00
Mike Duff
6a3af47bd8 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 93bbabda66 [formerly 2250983ad8] [formerly 6861a04120f0e5954cbc5868c9ecf103bfd55a3d [formerly 053082cb80]]
Former-commit-id: 5f64883b2d48cc4b5ac676320fb89c1bc7a1cac6 [formerly 0f4b98626b]
Former-commit-id: 9eb197d124
2013-07-01 11:53:07 -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
8396898d25 Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 5bcfa6048d [formerly f8213c16bd] [formerly 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f]]
Former-commit-id: 7e58477f239036376e80618fa5945526bec3a534 [formerly 3d6754337a]
Former-commit-id: cca3d4c19b
2013-07-01 00:04:43 -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
Dave Hladky
9d07cc7cbe Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

Former-commit-id: d5990cacc0 [formerly 083dff9e43] [formerly f5d3a5f012] [formerly d5990cacc0 [formerly 083dff9e43] [formerly f5d3a5f012] [formerly ee50b5c7be [formerly f5d3a5f012 [formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]]]
Former-commit-id: ee50b5c7be
Former-commit-id: 9637e9c427 [formerly 08a81cdaaf] [formerly 88c29ca5236793d376facb832530516c7a151d13 [formerly 2b90920d8f]]
Former-commit-id: e00545cf7393b15dcab893693970aa05a4ddccac [formerly 2a57eea47f]
Former-commit-id: 1b6421d4c3
2013-06-27 11:07:27 -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
Dave Hladky
f258e1e91d Issue #2146 Deleted uneeded jars from crawl4j plugin
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01

Former-commit-id: 9f621ed6f6 [formerly 2eded94be4] [formerly d92e039e72] [formerly 9f621ed6f6 [formerly 2eded94be4] [formerly d92e039e72] [formerly d298749486 [formerly d92e039e72 [formerly d16c25b55eb004223430e65a47f844d0ec8fba79]]]]
Former-commit-id: d298749486
Former-commit-id: 07227d8a4d [formerly e8ac45c21f] [formerly dc3c08fc586f55d74f5997ba1f7d8bdaee7b0ba7 [formerly 00ed2353ad]]
Former-commit-id: 81a68128096cd1ef98c033c1c936296d96a3888e [formerly ecf2849566]
Former-commit-id: 11c6036301
2013-06-26 14:59:22 -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
Richard Peter
d78167643e Merge "Issue #2144 Switched hibernate to Post GIS config" into development
Former-commit-id: 6bd546714c [formerly b616339f1d] [formerly 8a9feffa82] [formerly 6bd546714c [formerly b616339f1d] [formerly 8a9feffa82] [formerly ad91edf3de [formerly 8a9feffa82 [formerly d59f39da96caaf163ceb5bc7055b0412e118875b]]]]
Former-commit-id: ad91edf3de
Former-commit-id: 350804e7f4 [formerly 8c968f2120] [formerly 16947784ce2c607d53a7a1ee83a309f7883b0bcd [formerly dedc9ecda0]]
Former-commit-id: cc90e247ba329fde64f795ed2c7431ff29edc630 [formerly 46ef5c884a]
Former-commit-id: 18e49d732b
2013-06-25 18:22:09 -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
Dave Hladky
a6a2bd029f Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: 22c8646d12 [formerly b4e41b137d] [formerly 5aee30a473] [formerly 22c8646d12 [formerly b4e41b137d] [formerly 5aee30a473] [formerly fe5cde7afd [formerly 5aee30a473 [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]]]
Former-commit-id: fe5cde7afd
Former-commit-id: 1c84be15f0 [formerly 34400e34c7] [formerly 7c233606d6e544311ac333659bb714ce5abd5e6b [formerly 671b6ee566]]
Former-commit-id: f434b8d0be63cd3c9508e045f400856715ba657c [formerly c038109d5d]
Former-commit-id: 7dda985dd1
2013-06-25 13:31:37 -05:00
Dustin Johnson
c9b74d06a1 Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]]
Former-commit-id: 69c09e530f
Former-commit-id: 84ecc6dec4 [formerly da1ad3c8a0] [formerly 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]]
Former-commit-id: 99261465c72149de5291722572317482216a9d86 [formerly c2ed1495ad]
Former-commit-id: 9b42432838
2013-06-25 08:33:55 -05:00
Richard Peter
f6e6c3c531 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71 [formerly e03283ad4a] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f]
Former-commit-id: ed15c2edcc
2013-06-24 18:51:56 -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
Ron Anderson
9cfaeb51e2 Issue #2122 Fix the build
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: 74750fa37b [formerly ce42bdead7] [formerly f75554f1f7] [formerly 74750fa37b [formerly ce42bdead7] [formerly f75554f1f7] [formerly f06a8baf2d [formerly f75554f1f7 [formerly bf3b00be422d690aa9646462556607335ef85fc0]]]]
Former-commit-id: f06a8baf2d
Former-commit-id: 384984d8a8 [formerly eedb35faed] [formerly 14fe49bdf1189dc5b03eb0cc16d702b0f272039f [formerly 6740c9e40f]]
Former-commit-id: 558c7c24c3b45f4e994b40d227edb59c1a0ae33f [formerly 740542cd56]
Former-commit-id: d7d227a83a
2013-06-24 18:03:52 -05:00
Richard Peter
a39da3996e Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
Former-commit-id: 8aee8dc9b3 [formerly a67d190612] [formerly 5f85aefff6] [formerly 8aee8dc9b3 [formerly a67d190612] [formerly 5f85aefff6] [formerly a19a946a24 [formerly 5f85aefff6 [formerly ed31841e537d54ead391013919a94c879afd6f77]]]]
Former-commit-id: a19a946a24
Former-commit-id: 331f7d8c7d [formerly fdad3e08b7] [formerly ee8cacd99e8607bef0978c83c423e6fe4d72f038 [formerly 8481dd6bce]]
Former-commit-id: 0d6a1a2cb8cff64ea7d4e440395cade67cf5d718 [formerly f55e67c3ad]
Former-commit-id: 65d1bed2a8
2013-06-24 17:20:10 -05:00
Max Schenkelberg
815ab796b9 Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
Amend: Added fix for issue 2103
Amend: Added software history

Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b

Former-commit-id: 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly 47b55981c8 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: 6b4982e8a3 [formerly c912e8e6c5] [formerly 81f10786b9755a530e3615de10b091e1f0022d78 [formerly bc4ebb4f08]]
Former-commit-id: d7196e32710e3cc8969f238de14a54ee542ee1fa [formerly 20caab72f9]
Former-commit-id: 539bbe2cb5
2013-06-24 15:48:37 -05:00
Bryan Kowal
bf4e603d16 Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
Former-commit-id: 03366c8be3 [formerly 2b8984c445] [formerly 5b85217ca2] [formerly 03366c8be3 [formerly 2b8984c445] [formerly 5b85217ca2] [formerly cd2af684ca [formerly 5b85217ca2 [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]]]
Former-commit-id: cd2af684ca
Former-commit-id: e74d5231f4 [formerly a56679fa2a] [formerly 3739eeb144367fe4496f4f3576c97a105d3ba985 [formerly 7ebee00dc9]]
Former-commit-id: f0b6c706cc90420935e5eb81e46db07dd4bd4b84 [formerly 6cff1f63bb]
Former-commit-id: c525056059
2013-06-24 14:08:47 -05:00
Nate Jensen
fd6ecf1273 Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly 6541a89bf5 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]]]
Former-commit-id: 0479cea2e6
Former-commit-id: b1f538f69a [formerly 1408ed3e1e] [formerly 3e82d8ce1477d01da11ffd5777d74864cdbaed97 [formerly a2c5c2a1a3]]
Former-commit-id: 8b3404e8eac76fc9d9c024676d5bff3f54562907 [formerly 3b22e752aa]
Former-commit-id: 25f4b15072
2013-06-24 09:12:12 -05:00
Nate Jensen
fa9ed152ea Merge "Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests" into development
Former-commit-id: c144eb1e15 [formerly 8a76694b9f] [formerly b1bd29e784] [formerly c144eb1e15 [formerly 8a76694b9f] [formerly b1bd29e784] [formerly 69eec45f13 [formerly b1bd29e784 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]]]
Former-commit-id: 69eec45f13
Former-commit-id: 0740757d72 [formerly f4a6354929] [formerly f61565e208a6a4f9b5ba66da9365773b2a0eaa1e [formerly a44073cce6]]
Former-commit-id: 65599c55a63f72dbd999d4c3c4f89eea0ba5bbf3 [formerly 1c9458d595]
Former-commit-id: a103586ecd
2013-06-24 09:10:01 -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
Mike Duff
d1d92c033a Issue #2132 - Fix drawing lat/long box for madis point data
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

Former-commit-id: 9d3c4ce704 [formerly 7b3d79edc9] [formerly f685e73bd2] [formerly 9d3c4ce704 [formerly 7b3d79edc9] [formerly f685e73bd2] [formerly 14bd577f6c [formerly f685e73bd2 [formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]]]
Former-commit-id: 14bd577f6c
Former-commit-id: c180323417 [formerly defc6a3080] [formerly f7a3f48b1fa32bf56ed18d0e266ac2ee25be2f81 [formerly 65faaadc7c]]
Former-commit-id: 36915698d722a49fcbd05f616829abbe23289698 [formerly a8a4393c82]
Former-commit-id: 0e36cab21f
2013-06-21 14:59:03 -05:00
Dave Hladky
7af1216ef7 Issue #2129 mkdirs call added to create directories at instantiation.
Change-Id: I163e3f832e04af17da8a18196a10b50d30b8c83d

Former-commit-id: 2ad3456324 [formerly b781e784f9] [formerly 26398f6fb7] [formerly 2ad3456324 [formerly b781e784f9] [formerly 26398f6fb7] [formerly 0544a0cf88 [formerly 26398f6fb7 [formerly b8ae6705e92e8816385cb2fce87175bbb4687d6d]]]]
Former-commit-id: 0544a0cf88
Former-commit-id: c31c51deee [formerly 1f640b3173] [formerly e4b8756f8f25109e757f64231aff3bde10c6fa5e [formerly 57caa68867]]
Former-commit-id: 3ea4effe52a1befe2e30f2968f8589b4469f935e [formerly fe71c9133d]
Former-commit-id: 0baba17c1d
2013-06-21 11:13:04 -05:00
David Gillingham
05e1c69b0f Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 30b2287996 [formerly 5490893942] [formerly 6b696c9e6a] [formerly 30b2287996 [formerly 5490893942] [formerly 6b696c9e6a] [formerly 4f6c293a7e [formerly 6b696c9e6a [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]]]
Former-commit-id: 4f6c293a7e
Former-commit-id: c742708f76 [formerly 2e14d2fda4] [formerly e8aea9b56603cba076ff65c57ffbaf2151801218 [formerly 8b7a998bbf]]
Former-commit-id: c6a5e9febfd71b2c2b29748b230880a193976c0d [formerly 3a78e38ae5]
Former-commit-id: d88ca5e0c4
2013-06-20 16:31:43 -05:00
Dustin Johnson
147ef5ce3e Issue #2106 Fix setting of data size on gridded subscriptions
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925

Former-commit-id: 2184e50ce1 [formerly 71da2985f7] [formerly b486e5f2fe] [formerly 2184e50ce1 [formerly 71da2985f7] [formerly b486e5f2fe] [formerly 554b43807e [formerly b486e5f2fe [formerly c9138bb9d844ed7c38df420734c2723321ad450b]]]]
Former-commit-id: 554b43807e
Former-commit-id: 288442cc56 [formerly 7887201ebf] [formerly f2fb463c4b87ba9647cb7461559ab4814fb6d249 [formerly eaa3e47877]]
Former-commit-id: 1cbb92b6fbbf26251035f705e4326db36916114d [formerly 6987235067]
Former-commit-id: 2fed4b0da0
2013-06-20 16:00:08 -05: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
Dave Hladky
c168ee49ef Issue #2120 Fixed SSL connection problem
Change-Id: I4a4e277ac75420bbaa621dcddb562e654211436c

Former-commit-id: 76ffd26a2a [formerly 4a6248547a] [formerly ffc9dc1ac9] [formerly 76ffd26a2a [formerly 4a6248547a] [formerly ffc9dc1ac9] [formerly 47d18e42ab [formerly ffc9dc1ac9 [formerly 85d7c148e78a61025fa52f8c0996f99ab6075392]]]]
Former-commit-id: 47d18e42ab
Former-commit-id: 7d0a29e45e [formerly b2545d7408] [formerly a15be669f33bfbbd824bd50023487023cff935d3 [formerly 5d37e710d7]]
Former-commit-id: dd9c3ced65b1f75596d6065973439493e5da34e5 [formerly 806fb4f3db]
Former-commit-id: 0477abf081
2013-06-20 12:51:30 -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