Greg Armendariz
|
349784b4b1
|
Merge "Omaha #3676 harden numpy array to java array conversions to work with newer versions of python/numpy and not crash when heap cannot be allocated" into omaha_14.4.1
Former-commit-id: a8ecc9e313 [formerly b62baa3b3b] [formerly bb418e47ed] [formerly a8ecc9e313 [formerly b62baa3b3b] [formerly bb418e47ed] [formerly 21042a8945 [formerly bb418e47ed [formerly 57052aea644edc471adc3961739e07d4dcf80197]]]]
Former-commit-id: 21042a8945
Former-commit-id: 92853f70c1 [formerly de3e203b58] [formerly 4facbe3ee880294271ccb93df46709ee5226bea6 [formerly 74086cdd1a]]
Former-commit-id: 1cc334f7eda55deb19d36141994b54bf9fd00106 [formerly 7f2f8378ba]
Former-commit-id: aa485787f5
|
2014-10-15 14:19:28 -05:00 |
|
Nate Jensen
|
af26acde6f
|
Omaha #3676 harden numpy array to java array conversions to work with
newer versions of python/numpy and not crash when heap cannot be
allocated
Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288
Former-commit-id: 08b6622cec [formerly 852fe79de3] [formerly 433e8b6fc1] [formerly 08b6622cec [formerly 852fe79de3] [formerly 433e8b6fc1] [formerly b23d42f561 [formerly 433e8b6fc1 [formerly 67630fce01ecbd64a760211820af5b5eaff4cade]]]]
Former-commit-id: b23d42f561
Former-commit-id: 66a1fd1d05 [formerly d2156230f3] [formerly fa936e390fcdb29318649dd9a0ff0d548d0a3b1d [formerly 0a42a053af]]
Former-commit-id: 130afdad1004a03879b993036570260a88d94700 [formerly 60b037dd49]
Former-commit-id: f82d929130
|
2014-10-15 09:02:07 -05:00 |
|
Steve Harris
|
728899ed0c
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly f2fdf98d2f [formerly aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]]
Former-commit-id: f2fdf98d2f
Former-commit-id: 2858cc538b [formerly f3017b859e] [formerly 2b876a6e0e17ef46bda5eb65707f10272b529e42 [formerly da238d6478]]
Former-commit-id: 97fce6689e379c3cd2d664d9ad9821a9d4ec910b [formerly 3f6bdf84c5]
Former-commit-id: 3954f6981f
|
2014-10-15 08:42:02 -05:00 |
|
Brian Clements
|
dbb499ca17
|
Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab
Former-commit-id: 847d9c9925 [formerly 158aa3f439] [formerly 180696a594] [formerly 847d9c9925 [formerly 158aa3f439] [formerly 180696a594] [formerly 0a42113bbb [formerly 180696a594 [formerly 21924a6b536409681073f65d769bef53db049102]]]]
Former-commit-id: 0a42113bbb
Former-commit-id: 016b7763e8 [formerly 5c1e35dc2e] [formerly 4ace24a1335d88e66758722a343dd206931cbc5d [formerly a555477f7f]]
Former-commit-id: e97dd8d4574e96113876fce9ea7291d8df9981fb [formerly bf26a69d82]
Former-commit-id: 5c756fa3f8
|
2014-10-14 15:49:36 -05:00 |
|
Brian Clements
|
10956e859c
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 3207d12d51 [formerly 78c2aa3650] [formerly 3a12ab9bdf] [formerly 3207d12d51 [formerly 78c2aa3650] [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]]]
Former-commit-id: 6d6d3d26e6
Former-commit-id: 9a6cadddef [formerly d2042e3485] [formerly 48621bab7fab090a86fae6efa6712fd9419d4b52 [formerly 470a695a1a]]
Former-commit-id: 48bcd5641ac621600750d0346b7d8a2f58f7c784 [formerly cf3e570667]
Former-commit-id: 46845ee755
|
2014-10-13 16:32:41 -05:00 |
|
Richard Peter
|
9dd2d6522e
|
Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
Former-commit-id: eb68a84c26 [formerly ef5fcfe852] [formerly d2909b6e08] [formerly eb68a84c26 [formerly ef5fcfe852] [formerly d2909b6e08] [formerly 360114be70 [formerly d2909b6e08 [formerly a7b644d5e831bc38f0442efc16f681fd5ff317d7]]]]
Former-commit-id: 360114be70
Former-commit-id: c96334f119 [formerly 7d16235944] [formerly ec399aa3cec1a79c1ac60a6c14f35c55bc21a53e [formerly f692cbf631]]
Former-commit-id: 294e5f864ee370d7611bab2b6ab2694474a5048d [formerly d5908e242a]
Former-commit-id: ee07857e4f
|
2014-10-13 12:37:28 -05:00 |
|
Brian Clements
|
129df50eee
|
Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager
Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5
Former-commit-id: 7d4dbd204e [formerly c33a5ad562] [formerly dfb43fda31] [formerly 7d4dbd204e [formerly c33a5ad562] [formerly dfb43fda31] [formerly 2a7feaebfe [formerly dfb43fda31 [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]]]
Former-commit-id: 2a7feaebfe
Former-commit-id: 844cd86c28 [formerly 4429a04d2c] [formerly f8802ed9ae8429e0853425985fe3dec6fe60d41d [formerly 38b4d2683c]]
Former-commit-id: ab77d717ac89ffff13f622ac601eb1c2169d0af0 [formerly 53a61c3230]
Former-commit-id: 258be9acb0
|
2014-10-13 11:11:32 -05:00 |
|
Nate Jensen
|
18d63be7ec
|
Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59
Former-commit-id: 325a15e08f [formerly 5ae522c32a] [formerly b24faf99cd] [formerly 325a15e08f [formerly 5ae522c32a] [formerly b24faf99cd] [formerly 3eada560b7 [formerly b24faf99cd [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]]]]
Former-commit-id: 3eada560b7
Former-commit-id: 42b8cc19a1 [formerly 06a4cab622] [formerly 4d3864f439ff22df17470ff82898859a32ccc9e0 [formerly 26e9011f35]]
Former-commit-id: 30b2c101782c31faaa65ea59774ebdff9397595a [formerly 796db7518e]
Former-commit-id: 9acc1b0b57
|
2014-10-13 09:34:22 -05:00 |
|
Mark Peters
|
d71fcd6598
|
Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f
Former-commit-id: 4660b63394 [formerly f8e3c8412b] [formerly 5d87f3d22d] [formerly 4660b63394 [formerly f8e3c8412b] [formerly 5d87f3d22d] [formerly fb6131869c [formerly 5d87f3d22d [formerly b929d424107b0a2495f4305fd2500e362cccce4e]]]]
Former-commit-id: fb6131869c
Former-commit-id: 49ef7a1031 [formerly 727a916df5] [formerly 50225ba45f08abd6c25c15f3cede8666db675c23 [formerly 00004f21ed]]
Former-commit-id: 8caa9e43f590a54a66e3f6ee910e714b12842e43 [formerly 7cc0a3b62c]
Former-commit-id: 38cd69e6b0
|
2014-10-10 14:25:38 -05:00 |
|
Brian.Dyke
|
03f65ca414
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 6ae3795b7c [formerly f85eb2d0ac [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]]]
Former-commit-id: 6ae3795b7c
Former-commit-id: 4962750f7e [formerly 6034909d2d] [formerly b9b756a1fb303b55472d87a26e19fc89a60a9ac7 [formerly 36571c8238]]
Former-commit-id: 4dee77ada5e45267109cee2b90e6dc3c62342602 [formerly 969b40b517]
Former-commit-id: fdfc95c5ff
|
2014-10-10 11:01:01 -04:00 |
|
Richard Peter
|
6c2cfadf4c
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: fddf14712a [formerly db0e85e501] [formerly ed2bd7a261] [formerly fddf14712a [formerly db0e85e501] [formerly ed2bd7a261] [formerly 26e4c16da4 [formerly ed2bd7a261 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]]]
Former-commit-id: 26e4c16da4
Former-commit-id: a3a6b0a554 [formerly e71b0562b5] [formerly d2e0631fa3248d80703a209983c63962831939c8 [formerly bdb3bb263d]]
Former-commit-id: df60de25e6bd0dd52c1aba0d041f5e2f0cde4782 [formerly bcc3432a9d]
Former-commit-id: 6f4a6c7f6d
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
a8ee8adbad
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: 2112fb8e60 [formerly 8d58b8d524] [formerly 119b2bff17] [formerly 2112fb8e60 [formerly 8d58b8d524] [formerly 119b2bff17] [formerly fbabf6f18d [formerly 119b2bff17 [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]]]
Former-commit-id: fbabf6f18d
Former-commit-id: f7715d0c3b [formerly fa7a3e2e43] [formerly df78f5c496a36155869321af4867e6ab03d2ffb0 [formerly 6be495b787]]
Former-commit-id: b11048de8d398d05a7747684f0268aa35724516e [formerly f9e4622db7]
Former-commit-id: 0aa5f80ca8
|
2014-10-09 11:04:49 -05:00 |
|
Nate Jensen
|
4b7163ff79
|
Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 91ba36db75 [formerly 550b269370] [formerly f6601e4ee1] [formerly 91ba36db75 [formerly 550b269370] [formerly f6601e4ee1] [formerly 1a24808709 [formerly f6601e4ee1 [formerly 05a008ed69414e3977998cca45516a736181d5b6]]]]
Former-commit-id: 1a24808709
Former-commit-id: c14691cba1 [formerly f3c1ca00d2] [formerly 024f1c40cc395ad17cece7abc6f869ff6b39b5de [formerly 145db4077e]]
Former-commit-id: e83aebdfadbb6cd359c4c1a685edfb2e2319fd36 [formerly 17971ea0b6]
Former-commit-id: c9e949c8bd
|
2014-10-09 09:38:27 -05:00 |
|
Nate Jensen
|
45713940b4
|
Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: d36751c260 [formerly 87d33ff6ca] [formerly 0d33e661f2] [formerly d36751c260 [formerly 87d33ff6ca] [formerly 0d33e661f2] [formerly 98518f4cb6 [formerly 0d33e661f2 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]]]]
Former-commit-id: 98518f4cb6
Former-commit-id: 4db5642bd0 [formerly 6851264338] [formerly 75c66f217107e5e8b2a39939209f323c3da00152 [formerly 2a962aedf7]]
Former-commit-id: 86930d7e425e0216b1184a4910d2036def52b808 [formerly 96933e89a7]
Former-commit-id: 873cf49d2e
|
2014-10-09 09:02:36 -05:00 |
|
Brian Clements
|
dc45bb7100
|
Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: abb6b1f258 [formerly 1a6624d5d7] [formerly 87964cb500] [formerly abb6b1f258 [formerly 1a6624d5d7] [formerly 87964cb500] [formerly f0921db20c [formerly 87964cb500 [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]]]
Former-commit-id: f0921db20c
Former-commit-id: 49e6579115 [formerly d7c864113c] [formerly d5b69cedb564d53bd3cab131f05d49d804074b08 [formerly eac32a0fa0]]
Former-commit-id: 219ae40cec22d5a5e877b7c88ca0a55315f52516 [formerly 72c5dd03d2]
Former-commit-id: 51084e6548
|
2014-10-09 08:38:45 -05:00 |
|
Brian Clements
|
0be119b360
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 577b3a5e11 [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]]]
Former-commit-id: 577b3a5e11
Former-commit-id: fbffc63d5a [formerly 6ad5c3088d] [formerly 4cc2a0452da8ecf06e249d8ed7253d57b4357a97 [formerly 2de14cf885]]
Former-commit-id: 4ab31ef1abb0d696f1850c3f5c7dd3a3e55add19 [formerly 8ec3f473d7]
Former-commit-id: 3624ea94dc
|
2014-10-08 16:47:10 -05:00 |
|
Richard Peter
|
d215cc7fcb
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: a4fd6b8a09 [formerly 04bf8666b3] [formerly e8bc97501b] [formerly a4fd6b8a09 [formerly 04bf8666b3] [formerly e8bc97501b] [formerly fa15d4ff21 [formerly e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]]
Former-commit-id: fa15d4ff21
Former-commit-id: 422a457e9e [formerly baabb4a12f] [formerly 7a305bc6129c81c773d00eed85f56a1759d93cfa [formerly d97655272f]]
Former-commit-id: 867a14e53bc275209f6bf4d3d19485de51ca196e [formerly 26ee8506f5]
Former-commit-id: e5b9aa8b3f
|
2014-10-08 12:02:17 -05:00 |
|
Nate Jensen
|
6a60c19497
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 5886518b3b [formerly 2502976504] [formerly 4e582d0bde] [formerly 5886518b3b [formerly 2502976504] [formerly 4e582d0bde] [formerly 5cf1821a6a [formerly 4e582d0bde [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]]]
Former-commit-id: 5cf1821a6a
Former-commit-id: 8b8899fc2e [formerly 53c464b647] [formerly 789872670a0650c9c9b581c9d0d67b2ee58b08c5 [formerly 32fda0ae19]]
Former-commit-id: d23f99ce9a984fc9d497dfcf6c906ac83a827ad2 [formerly 9135b7458f]
Former-commit-id: a3f23422a7
|
2014-10-08 11:36:44 -05:00 |
|
Richard Peter
|
a936b8612b
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: 8ffa01471a [formerly f5dd25c8e4] [formerly a4bfd2d28b] [formerly 8ffa01471a [formerly f5dd25c8e4] [formerly a4bfd2d28b] [formerly a9562d992c [formerly a4bfd2d28b [formerly 110499cec453532545431a6fa05057f47af66ed2]]]]
Former-commit-id: a9562d992c
Former-commit-id: c217191493 [formerly 901877ec7a] [formerly 10f0ab60c2c0a25fca107e20817d044f303c4afe [formerly 1be207dccb]]
Former-commit-id: 0119dd744b38196e2ed0f52406b1c9c17f175d11 [formerly 1ec3bdd877]
Former-commit-id: 3998dac2f0
|
2014-10-07 16:32:48 -05:00 |
|
Nate Jensen
|
85774367dc
|
Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 92caee5227 [formerly 0bfc7514a4] [formerly 70521e80f8] [formerly 92caee5227 [formerly 0bfc7514a4] [formerly 70521e80f8] [formerly 6d0d6c2a96 [formerly 70521e80f8 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]]]
Former-commit-id: 6d0d6c2a96
Former-commit-id: c988ab129d [formerly 52e7dd82c0] [formerly 81b7914b3094bd0fe354bbbce1e009bec017a6d9 [formerly 5051b47832]]
Former-commit-id: c981b036f8f82e3cfc80ab10d981704f1af2defc [formerly 541e10e9d6]
Former-commit-id: 4126b426eb
|
2014-10-07 13:54:08 -05:00 |
|
Nate Jensen
|
6ab10f279f
|
Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: 3e4434f708 [formerly e63de52465] [formerly c066e8264d] [formerly 3e4434f708 [formerly e63de52465] [formerly c066e8264d] [formerly b0f025c0df [formerly c066e8264d [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]]]
Former-commit-id: b0f025c0df
Former-commit-id: dec72bc6c5 [formerly 0b10454635] [formerly ce928a70b87a81dd02c2e04fea570e6de94ae2ba [formerly b63050a0e9]]
Former-commit-id: dcfc7a4fcee1eaad28a80eb0597e7899bfdb5d34 [formerly 416a45b417]
Former-commit-id: 6e2dc7f7d3
|
2014-10-07 13:53:33 -05:00 |
|
Steve Harris
|
118c19a83d
|
Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java
Former-commit-id: c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]
Former-commit-id: c9e37bf440
Former-commit-id: e80527ade2 [formerly fc424d7336] [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52 [formerly fc35b7313d]]
Former-commit-id: 292297ad70be43ccc935b96eca7a8409d4033fc4 [formerly f370a2f54e]
Former-commit-id: 7c4bb336e1
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
8edd2ad753
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: 0cd0db130c [formerly 48352e964d] [formerly 66705190b5] [formerly 0cd0db130c [formerly 48352e964d] [formerly 66705190b5] [formerly 42cefd3655 [formerly 66705190b5 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]]]
Former-commit-id: 42cefd3655
Former-commit-id: 257c19ee5b [formerly 64a3e0898c] [formerly d78e7b959f63f20c32c2c42030847bd3d9091fdb [formerly 574005859a]]
Former-commit-id: 64ca55ce0cf89a3450ae37ad3fe38be7fd59dd0b [formerly 9b83a97637]
Former-commit-id: c56ea85517
|
2014-10-07 13:28:34 -05:00 |
|
Mark Peters
|
ba47bfd846
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 5ed537572a [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]]
Former-commit-id: 5ed537572a
Former-commit-id: e66adcd8ff [formerly 82e2a2bbb5] [formerly e8adb61acc7a249cc87878a153cb4b17d34bf566 [formerly c50ae98b5f]]
Former-commit-id: eab6b7d95d209e071ff8f9cbfcee197abb9ff1a3 [formerly c2173b1925]
Former-commit-id: dffbaa684d
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
0bfcdec3d4
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: caaf7f9723 [formerly 2637d1b07f] [formerly 773619f741] [formerly caaf7f9723 [formerly 2637d1b07f] [formerly 773619f741] [formerly ec37971eff [formerly 773619f741 [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]]]
Former-commit-id: ec37971eff
Former-commit-id: 65e1114f26 [formerly 67bece24d4] [formerly f7a65a072cadad5df1bf6f1cd57ad81fe808004f [formerly c964fb1e80]]
Former-commit-id: 728fb5fa3a6f593dbe3aaa7dfd1eb72f5ccd01b3 [formerly c148e3e56f]
Former-commit-id: eda2463f7e
|
2014-10-07 10:43:47 -05:00 |
|
Nate Jensen
|
94f99ada47
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 31f3bb414f [formerly 9c95c255c2] [formerly ef6da2a181] [formerly 31f3bb414f [formerly 9c95c255c2] [formerly ef6da2a181] [formerly b2dcfdf572 [formerly ef6da2a181 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]]]]
Former-commit-id: b2dcfdf572
Former-commit-id: 66a1c74989 [formerly 3caa2b3a21] [formerly 95af3f6b0b6efaecfa4c81a4a2a352015c7af4ed [formerly 58c8b04318]]
Former-commit-id: 3264102321c0ee2360649a60b79682d788af067e [formerly 41729296aa]
Former-commit-id: 2bb8579c76
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
f55b993e2b
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 1a4569eaef [formerly f8278a9ad3] [formerly 446e0bcdf6] [formerly 1a4569eaef [formerly f8278a9ad3] [formerly 446e0bcdf6] [formerly 9025e166dd [formerly 446e0bcdf6 [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]]]]
Former-commit-id: 9025e166dd
Former-commit-id: 7b982b0833 [formerly 06d562092d] [formerly be3094a4b7146ccbb7a91092d58b8513482d6d19 [formerly 00adad9546]]
Former-commit-id: 0b8665364577af24ca355547bb5dd0507d2c317f [formerly 7d4f951822]
Former-commit-id: 3c4e7bc755
|
2014-10-06 15:41:42 -05:00 |
|
Roger Ferrel
|
1eb7f14c99
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 50982e8160 [formerly 2f8d5263b9] [formerly dfbf07f377] [formerly 50982e8160 [formerly 2f8d5263b9] [formerly dfbf07f377] [formerly d4ef865375 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]]
Former-commit-id: d4ef865375
Former-commit-id: ecec042861 [formerly 05c00c7bc7] [formerly cb42eace946af5e6c4a04a8e522489b3f209954f [formerly 96f484e323]]
Former-commit-id: 9ad6c12354950dd916b1af65b9e0a613b027237b [formerly 7afe6d2df6]
Former-commit-id: 861da21f34
|
2014-10-06 15:34:30 -05:00 |
|
Michael Gamazaychikov
|
12b346f811
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: c338697738 [formerly a2c89ea11c] [formerly 7008af67fcd8171a0d155c064f558b3a2f7043fe [formerly 4613f0e9d1]]
Former-commit-id: e8740668a7325fb0966a81adfd4a9857c2f48201 [formerly 63f3558f48]
Former-commit-id: 488cf033a9
|
2014-10-06 15:32:10 -04:00 |
|
Steve Harris
|
cf73096716
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0]
Former-commit-id: afd3d3fa2d
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
50d26f0da8
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 87d80afd0b [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]]
Former-commit-id: de8b9cf0b8
Former-commit-id: 102a1f5c5b [formerly bfd4adcf63] [formerly eae87fcb1695bde68ef1e3bcb6269a6800c5953c [formerly e7c6cf60d5]]
Former-commit-id: b4e87d05085f2a52fa58791b6b3f2601d490818c [formerly 12ecb3b68a]
Former-commit-id: 47a9b16164
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
a7ed20921b
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly 23c5ea21e4 [formerly baec32be20 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 015c694d2f [formerly 3941281bb0] [formerly 7e9e75b3708abb852b52c881df4127de3e856477 [formerly 88afde5dfa]]
Former-commit-id: 43e8eb44fa4a566ec838fb8744a8301569eb65d6 [formerly fe4e43d8d3]
Former-commit-id: f623152a9c
|
2014-10-06 09:07:38 -05:00 |
|
Brian.Dyke
|
d8ccd40588
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]]
Former-commit-id: 92762f46c7
Former-commit-id: beb7a3f448 [formerly 64aef1a783] [formerly 6e5ec5380fe3992e157472559b5e85f288b4b251 [formerly 4dbdf9de26]]
Former-commit-id: d771453098f05cdadd94113c1504ef71db5e8e6b [formerly 91f89ee1f6]
Former-commit-id: 918de34464
|
2014-10-03 14:04:46 -04:00 |
|
Steve Harris
|
e40f190f9a
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
|
2014-10-03 10:18:34 -05:00 |
|
Brian.Dyke
|
9308ab8537
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 8f0310e3be [formerly 46956a01c6] [formerly b67eecdaf5931ae1d938fb48bd33e3327dd7a473 [formerly 72ea2fbe48]]
Former-commit-id: 1353c554161d3298ae22ce357602c081830d7584 [formerly a3ccdd9704]
Former-commit-id: 572bbdd019
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
2b3ced91f5
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 452a3f046b [formerly d174db3b0c] [formerly c24910662181554debcd898acc9cf5ec28027cf0 [formerly e77f1e126e]]
Former-commit-id: 2c9750edd9ade43fd7db7e61b4503a53d6f26781 [formerly 1d2dfd264a]
Former-commit-id: e100894074
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
18c69d87e2
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 75ac4f1971 [formerly 277b6e4b36] [formerly 93329339083b58eea30cf9a2fd0c9efc1645f3bb [formerly 36d377e08d]]
Former-commit-id: 99779fb5c1561694dd3f154813fbc624081344ca [formerly 7e465baead]
Former-commit-id: c853463f73
|
2014-10-02 10:24:04 -04:00 |
|
Nate Jensen
|
efd471e4a9
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 33e3281d55 [formerly e964375fcc [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]]
Former-commit-id: 33e3281d55
Former-commit-id: 54d382fa7c [formerly 23ebf782f3] [formerly 021f3802d2585856e5af0f032cd3a2f6494ac93f [formerly 6670e31705]]
Former-commit-id: 8a5f64af32a17d5ab4c7881b654de0d811d9f419 [formerly b0e0632c7a]
Former-commit-id: e156cf3b33
|
2014-10-02 08:49:32 -05:00 |
|
Nate Jensen
|
8e57ca99b6
|
Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419
Former-commit-id: 8b4c2fd720 [formerly 694b39c979] [formerly fc60a83082] [formerly 8b4c2fd720 [formerly 694b39c979] [formerly fc60a83082] [formerly b5d8e0a423 [formerly fc60a83082 [formerly 9519a47ea459390148d07e97189df86e094c037b]]]]
Former-commit-id: b5d8e0a423
Former-commit-id: 2819f2b18f [formerly a77f2a5ff0] [formerly 0343ed95829458ea532eb0d9ea4f20aa2263d16e [formerly b6aa0ae3fc]]
Former-commit-id: 4517179069308046088b88a741a89e5c5502c0b4 [formerly a37e67946a]
Former-commit-id: 3f7391214f
|
2014-10-02 08:30:25 -05:00 |
|
Steve Harris
|
9af0816bb1
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]]
Former-commit-id: cc34483b0b
Former-commit-id: 1935bca883 [formerly 8a627b9bf6] [formerly 624efa7bb6f054750278a0da16282ffd685e50b6 [formerly d711c1b67b]]
Former-commit-id: d7fad664b2074d5ba2b2d769ee3502435babad47 [formerly 074e12da64]
Former-commit-id: 18d68410e5
|
2014-10-02 08:09:02 -05:00 |
|
Nate Jensen
|
4a0c4d8f57
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: 1d0b39e615 [formerly 9e4bd6c1b7] [formerly cddda47923] [formerly 1d0b39e615 [formerly 9e4bd6c1b7] [formerly cddda47923] [formerly aa43004f85 [formerly cddda47923 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]]]]
Former-commit-id: aa43004f85
Former-commit-id: d78f48f053 [formerly 00fb5931d1] [formerly 3d7280866175e6600c65078e6edc5ad140c14be4 [formerly 2bca618f67]]
Former-commit-id: 22473a0f17808adfa8489b383e0dcc75fa089788 [formerly e6aae5c0cd]
Former-commit-id: 9238cd370f
|
2014-10-02 07:57:30 -05:00 |
|
Nate Jensen
|
c6526b09d8
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 53f2bf8395 [formerly 116f6840e2 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]]]]
Former-commit-id: 53f2bf8395
Former-commit-id: 0b9ac4f0b6 [formerly 026a2eaa11] [formerly d2b391bcede8d48901bb6d5c5dd7a23e1187ca17 [formerly 96790c0377]]
Former-commit-id: 7124fa90c17af1ac99e83dfa7ed053710a9b9dc2 [formerly 40b23efda4]
Former-commit-id: de77597192
|
2014-10-01 15:06:03 -05:00 |
|
Brian.Dyke
|
64b52f6e95
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: f180f63136 [formerly 4df4eb9c2b] [formerly a57615d594bf6386e1ca03920b1004483f28976a [formerly 914da168c8]]
Former-commit-id: af85c1c0498d395eb57281594d2bd53c3aeec77f [formerly 8184df119d]
Former-commit-id: ea401b327b
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
7f84fac2e6
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 7c7510d471 [formerly 659f4869bc [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]]]]
Former-commit-id: 7c7510d471
Former-commit-id: 0b750823dd [formerly c711fa910f] [formerly 046414031b27e91c03c30ed846bc0f672ece6786 [formerly f2cfa613fc]]
Former-commit-id: 32bcc7aec3bfec34b9c10f79ae07799fea8b23b6 [formerly 3e4656a60a]
Former-commit-id: 04c5093eee
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
b712c8253c
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 87d1286a0c [formerly 319ea78480 [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]]
Former-commit-id: 87d1286a0c
Former-commit-id: 11fda5a021 [formerly 3e9cb23496] [formerly f2d72c6cb377ab601a5112dcea06cb19760c30ae [formerly b658187cdb]]
Former-commit-id: fa9bc4bb70b11c8a6ad1dd3e97cdcb2ef26df4fc [formerly 14da412d3d]
Former-commit-id: 91e97ad173
|
2014-10-01 14:22:22 -05:00 |
|
Nate Jensen
|
c180b9d833
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 3146dd083c [formerly a5e4190b35 [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]]
Former-commit-id: 3146dd083c
Former-commit-id: 18945e612e [formerly e65065461c] [formerly a226aa671f6062c53c35774f2fc096ac613d3381 [formerly 728328f400]]
Former-commit-id: 88853bbd1a9a3555b9971c6c02d797461b1e27d8 [formerly d148780c7c]
Former-commit-id: 647dc473bf
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
56dd0566f7
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]]
Former-commit-id: f2633a56c0
Former-commit-id: f0362a03d4 [formerly f7a075907c] [formerly 2a2d868056e74cb4e29f291cba399ffd3f99c3fc [formerly 18acca9ef8]]
Former-commit-id: bc2c3efd4b7820055c54a4ed22e533c68dff148b [formerly b5998c975b]
Former-commit-id: d4b7693f81
|
2014-10-01 11:53:40 -05:00 |
|
Robert Blum
|
473b13d9d3
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly d5994a8a6b [formerly a1d23e4198 [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]]
Former-commit-id: d5994a8a6b
Former-commit-id: fb258e074b [formerly 4bb7ed8b2f] [formerly 2b50918a864a6561f6ca63465c557e0f0f669c60 [formerly 6c1676e743]]
Former-commit-id: afa8ac249a3defa7bcb35324e0be32ecf763713e [formerly 100e24245f]
Former-commit-id: 2d7c61f0a8
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
0e57a71184
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 41427a57bb [formerly 799ba1babf [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 0b0b9900fe [formerly e6100e8e7f] [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8 [formerly 78054658a3]]
Former-commit-id: eac63f07f79044de4bb76979473040b0e13d3b46 [formerly 86271d7dc9]
Former-commit-id: 18f7a6f1c0
|
2014-10-01 09:46:56 -05:00 |
|
dmsys
|
6b2eccce36
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|