Richard Peter
bc660b4352
Merge "Issue #1742 Fixed concurrent mod exception in DAT config updates Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e" into development
...
Former-commit-id: 531fa21a9c
[formerly fd4e8b931c
] [formerly e5b6102791
] [formerly 531fa21a9c
[formerly fd4e8b931c
] [formerly e5b6102791
] [formerly 39a56abb39
[formerly e5b6102791
[formerly 7988827cf78516d2b928db9004cec0ab5bebd08e]]]]
Former-commit-id: 39a56abb39
Former-commit-id: 4d01748097
[formerly cdc82ab15f
] [formerly a2323adbe5d1fc9877caa9023a75acaa597ae213 [formerly 2258c4cee1
]]
Former-commit-id: a729aacb8f7fc998c3d462dbe5b9e9283780f1a5 [formerly c15214630c
]
Former-commit-id: 3aa7b22c17
2013-08-19 10:10:38 -05:00
Dave Hladky
9b5d7d4119
Issue #1742 Fixed concurrent mod exception in DAT config updates
...
Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e
Former-commit-id: 1072e7760e
[formerly c25937ec85
] [formerly 111ffab3c9
] [formerly 1072e7760e
[formerly c25937ec85
] [formerly 111ffab3c9
] [formerly 6d9872d694
[formerly 111ffab3c9
[formerly 8f3cbb79c086845d49b7a877359cac3f83fc1c1c]]]]
Former-commit-id: 6d9872d694
Former-commit-id: 1aae775e7e
[formerly d290c84290
] [formerly d8004af680ebf95d68aa96730d6ee5f26937c6f4 [formerly 2702279e7a
]]
Former-commit-id: 181d02f8f348d7326491fdbc618f9b0bb29da64c [formerly a7de983a1c
]
Former-commit-id: c16bb222de
2013-08-16 16:26:19 -05:00
Richard Peter
7aec9b0204
Merge "Issue #2240 Fix incorrect environment assumptions" into development
...
Former-commit-id: 6b91e4573c
[formerly 60cd44b5a5
] [formerly 3c8f6762fe
] [formerly 6b91e4573c
[formerly 60cd44b5a5
] [formerly 3c8f6762fe
] [formerly d997b1b0fe
[formerly 3c8f6762fe
[formerly 8894c03f3db89e44ddc97d1ca897130670291687]]]]
Former-commit-id: d997b1b0fe
Former-commit-id: e07982bf6d
[formerly 9e393f0e9b
] [formerly e5a7649b5337ac75fddb9721acff4c9bd6ed00c3 [formerly d3f04844c1
]]
Former-commit-id: abe473c9e12ab0b11489872cd098555bce2a876b [formerly aaf413d874
]
Former-commit-id: 2ad455691f
2013-08-16 15:15:54 -05:00
Lee Venable
3355d33a5e
Issue #2256 - Memory leak fixes and some code clean up fixes.
...
Change-Id: I7b16871f59e63218b1d5754ac460bbab056f78a5
Former-commit-id: 1b42530bd5
[formerly 212c830986
] [formerly 752371bc63
] [formerly 1b42530bd5
[formerly 212c830986
] [formerly 752371bc63
] [formerly 49c06062fe
[formerly 752371bc63
[formerly 67228c5208da07cc56b95ce378ec50370541a260]]]]
Former-commit-id: 49c06062fe
Former-commit-id: 9df214963f
[formerly c11caef6ca
] [formerly 978b819ec8fd9cfe7db2d321fd3dab87bab0134e [formerly 606c25c093
]]
Former-commit-id: c7c598a5db475e75abbd0f298e9324480c265a32 [formerly 23f828983a
]
Former-commit-id: f0ec3034d0
2013-08-16 15:04:28 -05:00
Bryan Kowal
2d72709f52
Issue #2164 - fix 13.6 aviation rpm
...
Former-commit-id: acc4983510
[formerly 46976ba44b
] [formerly c113178a49
] [formerly acc4983510
[formerly 46976ba44b
] [formerly c113178a49
] [formerly 347a886099
[formerly c113178a49
[formerly bbeb36de32df79731ace5b56d4d746b8057707f0]]]]
Former-commit-id: 347a886099
Former-commit-id: 932f194bfd
[formerly 2a4eb86e05
] [formerly e0cc1d3170104e72a50bf4f4e849903d9a98fc76 [formerly e8e67a6905
]]
Former-commit-id: 9c6316f7db38d35e7f65041c9061262286be948a [formerly af5210414f
]
Former-commit-id: b2e870cd57
2013-08-16 14:21:03 -05:00
Mike Duff
e67de50fae
Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog
...
Peer review comments
Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0
Former-commit-id: e0ddf25ffb
[formerly 89cdc61d65
] [formerly 70af70ba8d
] [formerly e0ddf25ffb
[formerly 89cdc61d65
] [formerly 70af70ba8d
] [formerly 6190281e77
[formerly 70af70ba8d
[formerly 938c6d3151fc5b7513ee48fe9e9de0c60e7799a8]]]]
Former-commit-id: 6190281e77
Former-commit-id: a6241aa1f7
[formerly 8d27c7b420
] [formerly d87f78a39b53d661f4c977717f1277c1b9e92059 [formerly c4c73b4e3b
]]
Former-commit-id: c8c31d7dd3d6a04d0e4a3c70edcc2485fc1b0680 [formerly f22684b90b
]
Former-commit-id: e33069668b
2013-08-16 13:13:02 -05:00
Steve Harris
83e6985e1d
Merge branch 'omaha_13.5.1' into omaha_13.5.2
...
Former-commit-id: 7064944bd4
[formerly 9d07ebdab6
] [formerly bc8af6e701
] [formerly 7064944bd4
[formerly 9d07ebdab6
] [formerly bc8af6e701
] [formerly dc44ca76fb
[formerly bc8af6e701
[formerly ab28f86a23e1c8b83204f57da9b8e7bd15cafe98]]]]
Former-commit-id: dc44ca76fb
Former-commit-id: 61b0c9828a
[formerly 703a110473
] [formerly 3bff77e7ca1b42280f9bcc3367fa82e79e831485 [formerly e03750d5f9
]]
Former-commit-id: 9cb79ee3d809e5c16d17db72cc9f277e649fcc02 [formerly 3c03bff519
]
Former-commit-id: f93fdf5fc2
2013-08-16 12:45:01 -05:00
Bryan Kowal
e59d54624c
Issue #2164 - fix 13.6.1 CAVE build
...
Former-commit-id: 9f040ee969
[formerly 138d442180
] [formerly 197498e784
] [formerly 9f040ee969
[formerly 138d442180
] [formerly 197498e784
] [formerly 9e2aa969cf
[formerly 197498e784
[formerly eb249e6e879bcff4cbed17edde9307e5390d3619]]]]
Former-commit-id: 9e2aa969cf
Former-commit-id: 1e5c915b0a
[formerly 87038b3d36
] [formerly 73bfc014fcd01cb0f07f2df54f6dd2393728a4c8 [formerly 7cbd9bb75c
]]
Former-commit-id: dcf88fad1361b38ee81485e9572e5d201e62b33c [formerly da9d66d124
]
Former-commit-id: 28fa6a1962
2013-08-16 12:40:38 -05:00
Everett Kladstrup
b04c00446e
Issue #2240 Fix incorrect environment assumptions
...
* using $awips_home as the prefix for java/python/psql causes
problems on edex-environment (wes2bridge) installs; where
$awips_home does not contain the java/python/psql installs, instead
they are located at /awips2
Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee
Former-commit-id: 07f18003f1
[formerly 2803eded49
] [formerly 535248b69b
] [formerly 07f18003f1
[formerly 2803eded49
] [formerly 535248b69b
] [formerly fba53e9fe3
[formerly 535248b69b
[formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]]]
Former-commit-id: fba53e9fe3
Former-commit-id: 38a8d8268f
[formerly b602d37357
] [formerly 0dd804a51c987294808ac793df221d81414a3689 [formerly 6883cdc389
]]
Former-commit-id: 66a7cbb8f8a1b79dd97f3b32a6e6dc557e9297f9 [formerly 08bbf8620a
]
Former-commit-id: eb14f5a5fe
2013-08-16 11:02:15 -05:00
Nate Jensen
06f7412df3
Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development
...
Former-commit-id: 5b2e7006b6
[formerly f5e84f17ea
] [formerly 469df6d806
] [formerly 5b2e7006b6
[formerly f5e84f17ea
] [formerly 469df6d806
] [formerly d28cb1ff68
[formerly 469df6d806
[formerly 2f69b0b239a292711ed6b40a1348d357f65bdc67]]]]
Former-commit-id: d28cb1ff68
Former-commit-id: 6d6c0d121b
[formerly 8f6f749c60
] [formerly c43551d6dbc778aac9cbe8d81d942096567b5381 [formerly b34d67ced3
]]
Former-commit-id: 37904f943851d5fcb5276b047aa592b2601d92f9 [formerly bca8f9f3ca
]
Former-commit-id: 7710ab9c0e
2013-08-16 10:06:32 -05:00
Richard Peter
a88c9938ca
Merge "Issue #2196 final name change for registries. Now registry and centralRegistry." into development
...
Former-commit-id: 2ca642e7d9
[formerly bbde1db7a0
] [formerly ae1d4ca6b4
] [formerly 2ca642e7d9
[formerly bbde1db7a0
] [formerly ae1d4ca6b4
] [formerly ea98de5ad1
[formerly ae1d4ca6b4
[formerly e9dc49bfac807b7ddbe2a6ac39e13eb917aacf44]]]]
Former-commit-id: ea98de5ad1
Former-commit-id: bcdd57509a
[formerly 6bb8ae2dda
] [formerly 1989be5a9390d6ebd6e2683037b40396ddb99110 [formerly 8f12009352
]]
Former-commit-id: 9819abbc296fa19fda138ba9104e49f6fb50a390 [formerly b8bf91e9af
]
Former-commit-id: dd7b4a4705
2013-08-16 09:41:08 -05:00
Lee Venable
5325f580ed
Merge "Issue #2143 - Fix various issues with SCAN/DMD/TVS" into development
...
Former-commit-id: 7be73d7d2d
[formerly 65b9b35dbe
] [formerly ec5668caef
] [formerly 7be73d7d2d
[formerly 65b9b35dbe
] [formerly ec5668caef
] [formerly fbb341f176
[formerly ec5668caef
[formerly 83920d5ea505a04b920ab2da3caa7d27cf55d43b]]]]
Former-commit-id: fbb341f176
Former-commit-id: a94230dbe5
[formerly de18cd342d
] [formerly de5baac7fed91a1ab239ef66f170086b7b7e88ba [formerly faaeb93c7d
]]
Former-commit-id: ef7f4423a10dec81abc04f5b4987ab401d441051 [formerly 823e1c3562
]
Former-commit-id: 930524f962
2013-08-16 08:32:25 -05:00
Ben Steffensmeier
77f32fb76b
Issue #2260 Switch poessounding to NSharp.
...
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78
Former-commit-id: 63604dad27
[formerly fb23de355e
] [formerly 36a920333f
] [formerly 63604dad27
[formerly fb23de355e
] [formerly 36a920333f
] [formerly 74b0b57f4b
[formerly 36a920333f
[formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 644b43649a
[formerly ad82565d1a
] [formerly 2dc426002f0ac501f60be71e2c0a10436e7cf8c8 [formerly 94e79ff7b4
]]
Former-commit-id: 9bc206b592db7f0de1665d22e70fbdd6ba607733 [formerly e24647553f
]
Former-commit-id: d9932b5ce1
2013-08-15 17:51:52 -05:00
Nate Jensen
98648d5e15
Merge "Issue #2258 Convert profiler sounding to var height with hodo. Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6" into development
...
Former-commit-id: 1b7c95291f
[formerly 0f006e221e
] [formerly b92b67676c
] [formerly 1b7c95291f
[formerly 0f006e221e
] [formerly b92b67676c
] [formerly e4825013dd
[formerly b92b67676c
[formerly 2a570e7691354ff43d2cec751bfe2e51ef84c902]]]]
Former-commit-id: e4825013dd
Former-commit-id: 5d7f35f850
[formerly 78f8b742a6
] [formerly 67342bbbf9aecfe214a6724f0d72bc06fb6a1f30 [formerly 925478cac7
]]
Former-commit-id: ae631bdd7ea056e522d896b4daba7d6f8d74024e [formerly d0514389aa
]
Former-commit-id: 312256254d
2013-08-15 17:46:59 -05:00
Max Schenkelberg
dad1bc51a5
Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
...
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611
Former-commit-id: f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly 9e213438f4
[formerly 57a0df81a6
[formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]]
Former-commit-id: 9e213438f4
Former-commit-id: 53d4c9d9c2
[formerly 0703b5c772
] [formerly e195d4590671cefaed22b31ff4f8a803d2f88877 [formerly b67a3033f9
]]
Former-commit-id: 6ccb9209bae79b1c80076aabe8abaa3e4393a959 [formerly f720f78f4c
]
Former-commit-id: 16232ee8c7
2013-08-15 17:36:36 -05:00
Ben Steffensmeier
a9abfb00e7
Issue #2258 Convert profiler sounding to var height with hodo.
...
Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6
Former-commit-id: e401fe335f
[formerly b7b18e02bf
] [formerly 0c2f894b82
] [formerly e401fe335f
[formerly b7b18e02bf
] [formerly 0c2f894b82
] [formerly 32a0b19a38
[formerly 0c2f894b82
[formerly 2aab48d1032c0b6fd14645437836ad5ca13cb415]]]]
Former-commit-id: 32a0b19a38
Former-commit-id: 7811f7c18b
[formerly 890eaa3751
] [formerly b2f2e9a8c3c371425dac6b0fe4ec8f9a52e935af [formerly f75824d4bc
]]
Former-commit-id: e86ea3e56fbb43dbcd7e769fcac07f47756890ab [formerly 766fadfa67
]
Former-commit-id: 7ea9607352
2013-08-15 16:15:15 -05:00
Nate Jensen
8166f082b1
Merge "Issue #2033 moved avnfps and text workstation files into respective plugins." into development
...
Former-commit-id: 6643be23ad
[formerly 65753deffe
] [formerly ad209867bd
] [formerly 6643be23ad
[formerly 65753deffe
] [formerly ad209867bd
] [formerly 5ad699cd5b
[formerly ad209867bd
[formerly 54f5b92e5ce56be84d938cd47d5bd43b98b1251b]]]]
Former-commit-id: 5ad699cd5b
Former-commit-id: 64089c2441
[formerly b322a51e1e
] [formerly f1ed73ab0088e472f8d47689c83d4e89b389e4d5 [formerly 313eeaac9e
]]
Former-commit-id: da5af4f801ec2e8d82f62972e20d9b28a755a905 [formerly 5ec88138d6
]
Former-commit-id: 37b276d43f
2013-08-15 16:07:42 -05:00
Max Schenkelberg
b64a9336a9
Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
...
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7
Former-commit-id: 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 3800aec9e6
[formerly e85d66f4e5
[formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 39cdbf728f
[formerly 352e21ffd3
] [formerly ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029
]]
Former-commit-id: 1f274d37e697e17bfbf5f890a9373463aff7810c [formerly ee68615786
]
Former-commit-id: 6709242e36
2013-08-15 15:50:40 -05:00
Bryan Kowal
038e4deef4
Issue #2163 - build the java and awips2-common-base rpms
...
Former-commit-id: fa69d98320
[formerly dd55894802
] [formerly a3a5c799fc
] [formerly fa69d98320
[formerly dd55894802
] [formerly a3a5c799fc
] [formerly 7f8226d319
[formerly a3a5c799fc
[formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]]]
Former-commit-id: 7f8226d319
Former-commit-id: e63473681c
[formerly 178b4904ef
] [formerly 13c28d981888a56ba89f41db6a1eb715dc47ee3c [formerly 110fb14b91
]]
Former-commit-id: 25b46948bc574e6bb3ed33397af485deae77cff5 [formerly 64fe4b6760
]
Former-commit-id: cf5293fe91
2013-08-15 15:40:18 -05:00
Bryan Kowal
c236be07f6
Issue #2163 - copy additional httpd source to the rpm SOURCES directory
...
Former-commit-id: 18a3f63616
[formerly 4e3c577c56
] [formerly 32f3e63bd5
] [formerly 18a3f63616
[formerly 4e3c577c56
] [formerly 32f3e63bd5
] [formerly 382cb87fa3
[formerly 32f3e63bd5
[formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]]
Former-commit-id: 382cb87fa3
Former-commit-id: 38c4f03c0a
[formerly 6a129d3a96
] [formerly bd8c04417fd168b2227cc23f892d33fc380013fa [formerly 50ab20be95
]]
Former-commit-id: 503397f6e87caa0148f630463b4737d8b4056cee [formerly 2205b4a02f
]
Former-commit-id: a533b3b52c
2013-08-15 15:40:05 -05:00
Bryan Kowal
67a52cd7b0
Issue #2163 - remaining RHEL6 RPM changes
...
- Amend: update build.sh to build the full set of rpms
Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f
Conflicts:
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
Former-commit-id: 23fb13a41c
[formerly 7d7511af9b
] [formerly 19d80d96c3
] [formerly 23fb13a41c
[formerly 7d7511af9b
] [formerly 19d80d96c3
] [formerly c0458d512d
[formerly 19d80d96c3
[formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]]
Former-commit-id: c0458d512d
Former-commit-id: 2a9f4d41c9
[formerly f68943aeef
] [formerly b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3
]]
Former-commit-id: ba3cdfa1c21458bf0f95c2202e0d7749db484d77 [formerly 5b55bd8c72
]
Former-commit-id: a3f3f45f4b
2013-08-15 15:39:37 -05:00
Bryan Kowal
d75fd1d5ec
Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
...
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
Former-commit-id: 31ee9b4bdc
[formerly a962be9a15
] [formerly 0b4961e9b0
] [formerly 31ee9b4bdc
[formerly a962be9a15
] [formerly 0b4961e9b0
] [formerly 8b51e353f1
[formerly 0b4961e9b0
[formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]]
Former-commit-id: 8b51e353f1
Former-commit-id: 5ccd628305
[formerly 9943f3a57c
] [formerly b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c
]]
Former-commit-id: 96167e3734f02c78a86ef1c1abf9b19316a64ba9 [formerly 9af6b44727
]
Former-commit-id: 9f506d7ce6
2013-08-15 15:38:11 -05:00
Bryan Kowal
cb7e87d9a4
Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
...
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
Former-commit-id: fb1feea107
[formerly 683d7e5b19
] [formerly c1dab22fdb
] [formerly fb1feea107
[formerly 683d7e5b19
] [formerly c1dab22fdb
] [formerly 94eacfc460
[formerly c1dab22fdb
[formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]]
Former-commit-id: 94eacfc460
Former-commit-id: 33b6f03899
[formerly 53124c5e02
] [formerly b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6
]]
Former-commit-id: e3b28978c51f9031cb777d8427d123b55b738085 [formerly eab659f961
]
Former-commit-id: 2e6116a952
2013-08-15 15:30:05 -05:00
Bryan Kowal
cc84331809
Issue #2163 - additional RHEL6 changes
...
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready
Former-commit-id: 6e76fc6624
[formerly 5feab7c0be
] [formerly bbca63a8b8
] [formerly 6e76fc6624
[formerly 5feab7c0be
] [formerly bbca63a8b8
] [formerly 36eca9bbfb
[formerly bbca63a8b8
[formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]]]
Former-commit-id: 36eca9bbfb
Former-commit-id: 45ab6afc31
[formerly 9b62e39fff
] [formerly be9ce96e1e14d369e98c21317e7f54a4d7d48430 [formerly 1f5e92aac9
]]
Former-commit-id: 371f2a79d88405004e831cbc983ff10de8c7cfeb [formerly 858a41c50d
]
Former-commit-id: b32933f72a
2013-08-15 15:25:52 -05:00
Bryan Kowal
9bf0e0ab3c
Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
...
Former-commit-id: 37ebd41ee0
[formerly 1c2ca11a33
] [formerly b08a9da804
] [formerly 37ebd41ee0
[formerly 1c2ca11a33
] [formerly b08a9da804
] [formerly b1e4e77a13
[formerly b08a9da804
[formerly 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b]]]]
Former-commit-id: b1e4e77a13
Former-commit-id: b177c46971
[formerly a5effbed37
] [formerly 290da1b6c7cb0a4e7ce8b2b679428c5b1cd6adc2 [formerly c97d4f42b6
]]
Former-commit-id: aad45a32804a8acb7021f846cf3cb4bab5ff5424 [formerly 8068e7a7b2
]
Former-commit-id: b68cdebe4e
2013-08-15 15:25:43 -05:00
Bryan Kowal
016bc8099d
Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
...
- httpd has been updated for compatibility
Former-commit-id: 3074681a82
[formerly d3f5a8ecfd
] [formerly 91a84e57b5
] [formerly 3074681a82
[formerly d3f5a8ecfd
] [formerly 91a84e57b5
] [formerly c0614bc7d4
[formerly 91a84e57b5
[formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]]]
Former-commit-id: c0614bc7d4
Former-commit-id: b1bf843307
[formerly 68c89e6736
] [formerly c5c75095cdb39d40899d94cb78da35c31632b661 [formerly ba04336262
]]
Former-commit-id: ab7b60780791a6953edc75b72d16a7558fda6a96 [formerly 44722e1106
]
Former-commit-id: 4df25d3b0f
2013-08-15 15:25:02 -05:00
Bryan Kowal
ad5a8ced22
Issue #2163 - 64-bit RHEL6 rpm conversion
...
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries
Former-commit-id: 35478ce5ff
[formerly b32922186d
] [formerly 0bee225031
] [formerly 35478ce5ff
[formerly b32922186d
] [formerly 0bee225031
] [formerly e686f9bdda
[formerly 0bee225031
[formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]]]
Former-commit-id: e686f9bdda
Former-commit-id: d30c098382
[formerly 8d4645a0a4
] [formerly d66458a6e3e011df4ee392929eae99b13093533d [formerly e24b249d5b
]]
Former-commit-id: 1606e698a2e37ca23b45451d93010cb5de3244f1 [formerly 5b451d09f1
]
Former-commit-id: 55e29b2bba
2013-08-15 15:24:48 -05:00
Bryan Kowal
832f4a5250
Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
...
Former-commit-id: 61b14897fd
[formerly 2b4faafed7
] [formerly e3e596eb5d
] [formerly 61b14897fd
[formerly 2b4faafed7
] [formerly e3e596eb5d
] [formerly be011d3b92
[formerly e3e596eb5d
[formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]]]
Former-commit-id: be011d3b92
Former-commit-id: 5185e79785
[formerly 6561efe457
] [formerly 475cbcc55e42aa6fa76623a7fa80a66662613073 [formerly 7b1615ba80
]]
Former-commit-id: 30dc8c2a9b14c42729bb6d14f3cdcd806be041dd [formerly 8331e2a16a
]
Former-commit-id: f61b437746
2013-08-15 15:24:11 -05:00
Brad Gonzales
d622dc327d
Issue #2196 final name change for registries. Now registry and centralRegistry.
...
Change-Id: I172aa9918c2281fa2923503eeb067954e4bf955f
Former-commit-id: 7cf7c73053
[formerly 18956d5816
] [formerly 2279d03112
] [formerly 7cf7c73053
[formerly 18956d5816
] [formerly 2279d03112
] [formerly 705d4660cc
[formerly 2279d03112
[formerly f5a61ca98bc2da6bb69ef6f78fe40e390bfab45f]]]]
Former-commit-id: 705d4660cc
Former-commit-id: 32a2f9cff4
[formerly 48cc348080
] [formerly 8eaf9ba357094cfe61c11d3c50bbdda77fcde437 [formerly cf77bb12b7
]]
Former-commit-id: 7a23b5b5305710d783d1778f61b8242b10d72fc8 [formerly 9c63e17a83
]
Former-commit-id: 223a52eece
2013-08-15 14:57:53 -05:00
Bryan Kowal
5e55dde47f
Issue #2257 - edexBridge now uses qpid 0.18 (64-bit)
...
- Amend: updated for 32-bit
- Amend: close sender, session, and connection independently
Change-Id: I9b8cafbc10d81782a812e9d2d57930e859fa29a5
Former-commit-id: fac61175b6
[formerly 14fc0aba77
] [formerly da29ff63f4
] [formerly fac61175b6
[formerly 14fc0aba77
] [formerly da29ff63f4
] [formerly 431dbaeaac
[formerly da29ff63f4
[formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]]]
Former-commit-id: 431dbaeaac
Former-commit-id: f2f9b319a2
[formerly 00c47b4f24
] [formerly b2c86076a9640772277bd4127df600a8866f4e44 [formerly 7c3c19f794
]]
Former-commit-id: acb4842f21cb13e49ecde160efc7cadf572415ef [formerly 36c1e6cff3
]
Former-commit-id: e359fa1588
2013-08-15 14:30:55 -05:00
Mike Duff
e9fd7208be
Issue #2143 - Fix various issues with SCAN/DMD/TVS
...
Change-Id: Ice9a0f13881c31ca1d51f2f2158f74caa064f1f8
Former-commit-id: 71d725ae07
[formerly e31a6c3426
] [formerly c871d6a1cd
] [formerly 71d725ae07
[formerly e31a6c3426
] [formerly c871d6a1cd
] [formerly 640a154647
[formerly c871d6a1cd
[formerly 0d5a35fcaac31c594ae7e5abda889e75a772c352]]]]
Former-commit-id: 640a154647
Former-commit-id: f84671f284
[formerly 136a98785b
] [formerly b69387bbc5be20457dc6bf7e7e6e921b75d8fabc [formerly 03b3b3860a
]]
Former-commit-id: 331d8ace99c726d0808a0d7487cd581c1344eaa9 [formerly 976e9956d6
]
Former-commit-id: aac43728d3
2013-08-15 14:14:07 -05:00
Max Schenkelberg
c451c3f485
Issue #2189 Added a FontType option when initializing a font from a file.
...
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments
Former-commit-id: 59f3945002
[formerly b07ed474e3
] [formerly eab65aab5a
] [formerly 59f3945002
[formerly b07ed474e3
] [formerly eab65aab5a
] [formerly 570266eb7b
[formerly eab65aab5a
[formerly 473421a32f7c53453db1c5331714204a89bad4da]]]]
Former-commit-id: 570266eb7b
Former-commit-id: 43fc7e0b43
[formerly 72fbe0208e
] [formerly 3b2d7d1617ff2d360cb22f44c042b38c9fe3c5e3 [formerly 5840d99a95
]]
Former-commit-id: 4a47963fe5b1b33e65906b17daec7ec70eb5b3d1 [formerly 4191582186
]
Former-commit-id: b75d942133
2013-08-15 13:51:07 -05:00
David Gillingham
3b668e4071
Issue #2262 : Fix ImportError and misnamed method in meteolib.py.
...
Change-Id: Ic6eb7de7b8c5b6ff7fbd989a43d00c97ea688364
Former-commit-id: d43d6506fa
[formerly a8868c5beb
] [formerly 8ef34db798
] [formerly d43d6506fa
[formerly a8868c5beb
] [formerly 8ef34db798
] [formerly 953fc192a1
[formerly 8ef34db798
[formerly b61065e473c5f783ebe3cfd603a9e7bd91b63a11]]]]
Former-commit-id: 953fc192a1
Former-commit-id: be64302011
[formerly afbb147ef6
] [formerly 502cb37326055c452bc1b35e8e9edab2d5e952b0 [formerly a4ed28a384
]]
Former-commit-id: 953043ab88da93fff26cf4cc51a5ff5048b7eaeb [formerly 3d3f785fdd
]
Former-commit-id: ff61a0701c
2013-08-15 13:14:39 -05:00
Steve Harris
a352190ff4
Merge branch 'omaha_13.5.1' into omaha_13.5.2
...
Former-commit-id: b9fbfe4b48
[formerly dfee8ca5d9
] [formerly 67f7a8db62
] [formerly b9fbfe4b48
[formerly dfee8ca5d9
] [formerly 67f7a8db62
] [formerly 282577d168
[formerly 67f7a8db62
[formerly cfd93a48150e8c559622e806e98362a51f19aee0]]]]
Former-commit-id: 282577d168
Former-commit-id: 1c79df1f15
[formerly 1b31d1d62f
] [formerly 458c6230be297d0d6293dff70ec0b5b8c49bc0db [formerly 877d672852
]]
Former-commit-id: 8c36f86a999a226bbf1b5e8b218ddf81d53962ad [formerly 850d0d54c6
]
Former-commit-id: 7d10f18ae8
2013-08-15 12:55:24 -05:00
Steve Harris
542323ab42
Merge branch 'omaha_13.5.1' (13.5.1-16) into development
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
nativeLib/edex_com/.cproject
Former-commit-id: 56416708fc
[formerly 3f8cc1daf3
] [formerly 8484f03bb8
] [formerly 56416708fc
[formerly 3f8cc1daf3
] [formerly 8484f03bb8
] [formerly 891f00d650
[formerly 8484f03bb8
[formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]]
Former-commit-id: 891f00d650
Former-commit-id: aba7f09b15
[formerly 2681f1f045
] [formerly 39e71fd5cc358e2f7e3567f0928d250b71241a87 [formerly 44251fd949
]]
Former-commit-id: 6d3c05b870a1a67a07a0d6721f161cfdfe3904e3 [formerly e2a322158b
]
Former-commit-id: 52564dc43c
2013-08-15 12:50:08 -05:00
Steve Harris
adaa30e7f5
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: 8f0b0c1514
[formerly 08b105a492
] [formerly 727eba03b9
] [formerly 8f0b0c1514
[formerly 08b105a492
] [formerly 727eba03b9
] [formerly a687da6075
[formerly 727eba03b9
[formerly 85cde5da231741012e611250a5c3490467aeef1b]]]]
Former-commit-id: a687da6075
Former-commit-id: 27a5acb143
[formerly e5c50ad0b6
] [formerly d74946ee629b4883a0e073d9f37dae4d8ca4ed97 [formerly 522867f068
]]
Former-commit-id: 86cceeaa9d516d6e56a58f9f4e08ab3f2b3ad1c3 [formerly 08a7c0831f
]
Former-commit-id: f8442ee983
2013-08-15 12:46:48 -05:00
Steve Harris
ca5109f3d6
13.5.1-16 baseline
...
Former-commit-id: 47130c98a5
[formerly 6818d80085
] [formerly cd3b63d961
] [formerly 47130c98a5
[formerly 6818d80085
] [formerly cd3b63d961
] [formerly 7ce0234d76
[formerly cd3b63d961
[formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]]
Former-commit-id: 7ce0234d76
Former-commit-id: ca5796e082
[formerly e881ff6271
] [formerly 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900
]]
Former-commit-id: 8ac6ca8ce4a5022058bcf2cfc30b1481b8e7c987 [formerly af2b4495bb
]
Former-commit-id: ff03caef3d
2013-08-15 13:40:37 -04:00
Max Schenkelberg
3c02342d04
Issue #2033 moved avnfps and text workstation files into respective plugins.
...
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: db24201469
[formerly bbad83c21a
] [formerly 6f60751ec6
] [formerly db24201469
[formerly bbad83c21a
] [formerly 6f60751ec6
] [formerly c5575f9624
[formerly 6f60751ec6
[formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]]
Former-commit-id: c5575f9624
Former-commit-id: 62f4f1bafb
[formerly 8139e0dfb7
] [formerly 33159773a1764cd4fb517d13a3cff0a11feaa433 [formerly 8de539020d
]]
Former-commit-id: 094fceec6e1d9989f5e80a4efe1310f8a093b3ef [formerly 451eb54a36
]
Former-commit-id: f553c93092
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
6e3635d147
Issue #2259 fix units for goes point data pressure
...
Former-commit-id: 91df4581d2
[formerly d3628766b8
] [formerly 2171c10e9e
] [formerly 91df4581d2
[formerly d3628766b8
] [formerly 2171c10e9e
] [formerly 984c5f2684
[formerly 2171c10e9e
[formerly 411c30dc9a5396ade5af03294cad612472e8060b]]]]
Former-commit-id: 984c5f2684
Former-commit-id: 15a295ca05
[formerly 7070a2bd18
] [formerly 430e4cc00c7532c4d09b1b5178c1c9a413e1a952 [formerly fff0ce30ae
]]
Former-commit-id: 42a91fc280b2738b832787ba3922d2183e954dde [formerly 5a6ad9b554
]
Former-commit-id: 1ffc606115
2013-08-15 12:02:24 -05:00
David Gillingham
2e5e666153
Issue #2262 : Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
...
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: bd9b224ff5
[formerly c17f8b4409
] [formerly 0b6b0e06cc
] [formerly bd9b224ff5
[formerly c17f8b4409
] [formerly 0b6b0e06cc
] [formerly 40b5d54bf3
[formerly 0b6b0e06cc
[formerly 5992197809236553e9c021526e42d28ed327b413]]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 218ec39696
[formerly 9c656c28b9
] [formerly 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2
]]
Former-commit-id: c1a7c1d2b9b5f35177db262289e7dc470702f3ad [formerly f46f62ff2e
]
Former-commit-id: a217ce6044
2013-08-15 11:30:45 -05:00
Jonathan Sanchez
04a7a8be95
Issue #2243 Resolved timing issues.
...
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: 6902b263e5
[formerly 78b655fd1f
] [formerly 2b849d7003
] [formerly 6902b263e5
[formerly 78b655fd1f
] [formerly 2b849d7003
] [formerly bc30396b63
[formerly 2b849d7003
[formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]]
Former-commit-id: bc30396b63
Former-commit-id: 93efe34bc1
[formerly 19853a4b57
] [formerly 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca
]]
Former-commit-id: 0f4fd7ee29ee416395f4664b305f331228350a64 [formerly dbb60f2c13
]
Former-commit-id: a1dc6ac50b
2013-08-15 10:56:37 -05:00
Ron Anderson
69d5f7a845
Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
...
Former-commit-id: d70ba1184d
[formerly 5afcf8bee2
] [formerly 2b491f11ad
] [formerly d70ba1184d
[formerly 5afcf8bee2
] [formerly 2b491f11ad
] [formerly ca560e5fc0
[formerly 2b491f11ad
[formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]]]
Former-commit-id: ca560e5fc0
Former-commit-id: afcfafb027
[formerly 7924115bbc
] [formerly 721ef25321b96666b7f8c0e38c59a7d3b652d02c [formerly 86b10cfd4b
]]
Former-commit-id: 16137f59d317eeea53ab4d0ab2a61d11ad464e53 [formerly 6ae94c0f65
]
Former-commit-id: 6a8381426a
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
a19d136402
Issue #1133 Better error handling for invalid polygons in map resource.
...
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442
Former-commit-id: b887dcbe6d
[formerly aa08c8af42
] [formerly 27594e6808
] [formerly b887dcbe6d
[formerly aa08c8af42
] [formerly 27594e6808
] [formerly 7f9bbf3d52
[formerly 27594e6808
[formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]]]
Former-commit-id: 7f9bbf3d52
Former-commit-id: 6b5e7b465b
[formerly b970d2ffbb
] [formerly 2620f59e4670bcb1f4adcdc1ccc3ccf9e49ea0f2 [formerly 5b51795a18
]]
Former-commit-id: a724e50099a376a91cf13129b4d2241cced2d608 [formerly 717b078a6a
]
Former-commit-id: 8830b5717f
2013-08-15 10:32:28 -05:00
Brad Gonzales
4c0486fe6a
Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
...
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
and other recommendations from peer review. Removed count attribute
from RegistryStatisticsEvent. Changed construction of SubsriptionRequestEvents
to set numRecords attribute.
Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2
Former-commit-id: edbea8c515
[formerly e4251ad380
] [formerly d2dac35b65
] [formerly edbea8c515
[formerly e4251ad380
] [formerly d2dac35b65
] [formerly 64c6e5abff
[formerly d2dac35b65
[formerly 818688266a32feec2081f0c6e74a37e431df9435]]]]
Former-commit-id: 64c6e5abff
Former-commit-id: 278d98e214
[formerly fa4e8d9897
] [formerly 974ed273b70311d9cd1f9f764733500330fab491 [formerly 84e14a5a62
]]
Former-commit-id: 6c54b71951c093498c34a0c510163341d426c429 [formerly 4d4f281553
]
Former-commit-id: 04f9dfb84a
2013-08-15 09:35:10 -05:00
Richard Peter
7775ed3e03
Issue #2214 : Fix merge issue with gfe-spring.xml
...
Former-commit-id: e5cb3f9e0a
[formerly 2064be203d
] [formerly eb8805e51c
] [formerly e5cb3f9e0a
[formerly 2064be203d
] [formerly eb8805e51c
] [formerly dad1b6fb45
[formerly eb8805e51c
[formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]]
Former-commit-id: dad1b6fb45
Former-commit-id: 24f8756c64
[formerly bbe1002d2d
] [formerly cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430
]]
Former-commit-id: 30a7e16fcc217a4db3ce6d7a8d94a5a6e0494a27 [formerly b09a191bfc
]
Former-commit-id: c27aa3bd98
2013-08-14 18:32:39 -05:00
David Gillingham
35ac7e0631
Issue #2009 : Fix NullPointerException in SocketServer start up.
...
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e
Former-commit-id: bbd1a39f37
[formerly 8faf78d220
] [formerly 2d6c6cdd39
] [formerly bbd1a39f37
[formerly 8faf78d220
] [formerly 2d6c6cdd39
] [formerly 17a45cafe5
[formerly 2d6c6cdd39
[formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]]]
Former-commit-id: 17a45cafe5
Former-commit-id: f886d99f18
[formerly 64d4ecca53
] [formerly 691b2f8318eef69e3a7cb2bcf7eb3a7e6249393b [formerly db0d0374b0
]]
Former-commit-id: 9370fc49f6826f65ef9379ccf0770b76927989f9 [formerly 6277627e7e
]
Former-commit-id: 7729c52e6d
2013-08-14 17:13:58 -05:00
David Gillingham
982d19d1cf
Issue #2009 : Implement dual-domain GFE export_grids solution. Update MHS
...
emulator program to support new directory structure and some code cleanup and
refactoring.
Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d
Former-commit-id: 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly f8b6ec20c1
[formerly 0f4f24beb8
[formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 5205fe56a7
[formerly 3af47effc5
] [formerly 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a
]]
Former-commit-id: b6b4ffccf0253f44efcf7208a528d5943d4e677e [formerly 4bd40cd544
]
Former-commit-id: a2a4d1fbcf
2013-08-14 17:10:04 -05:00
Nate Jensen
fe3c7cc4f1
Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
...
Former-commit-id: f9af5f041e
[formerly bc80d6f7dc
] [formerly ce4d54ee5a
] [formerly f9af5f041e
[formerly bc80d6f7dc
] [formerly ce4d54ee5a
] [formerly f08d3f4a9d
[formerly ce4d54ee5a
[formerly 22288cd9249420ffd643e5bb6d1f84bc6eda5326]]]]
Former-commit-id: f08d3f4a9d
Former-commit-id: 1e75952565
[formerly 01f2bcd45c
] [formerly d6069bf8bb695ef3d66acffc9dbfab17426bbf87 [formerly d8812ab5f0
]]
Former-commit-id: db8727f00c028fc9808df28fdc4beb09b8018a72 [formerly 252be9c401
]
Former-commit-id: 5c3562fc6f
2013-08-14 15:45:29 -05:00
Richard Peter
175d2fe542
Issue #1977 : Fix merge issue with WarngenDialog
...
Former-commit-id: 4dc2cdd1d4
[formerly 8ba6abf642
] [formerly 7c03fc955b
] [formerly 4dc2cdd1d4
[formerly 8ba6abf642
] [formerly 7c03fc955b
] [formerly a5383dbfa4
[formerly 7c03fc955b
[formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]]
Former-commit-id: a5383dbfa4
Former-commit-id: 309c524817
[formerly c8ad0e3317
] [formerly adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7
]]
Former-commit-id: 125b487f38e49cee304df044315c5a80d119bf32 [formerly 6ebc5d67bd
]
Former-commit-id: 0e62a4243e
2013-08-14 15:33:02 -05:00
Richard Peter
e6a36eb12a
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 181df35afc
[formerly 1f32ef9c7a
] [formerly 5e5047cc4f
] [formerly 181df35afc
[formerly 1f32ef9c7a
] [formerly 5e5047cc4f
] [formerly 2a9276c728
[formerly 5e5047cc4f
[formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 84bef1f2ec
[formerly c0b0eef331
] [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f
]]
Former-commit-id: 45b98e41300d826058702743e6eeb0852aa1ad89 [formerly 9cf5e247ab
]
Former-commit-id: 42c78326f1
2013-08-14 15:23:18 -05:00