eacc03d05eeef76af817b086552f319a4705816c CORP\thanley corpthanley@mtvl08w001094.(none) http://github.com/technoweenie/masochism/commit/7d07347a2eafea5d8b51452f7a33ba25dd8e6f7a 7d07347a2eafea5d8b51452f7a33ba25dd8e6f7a 2009-01-11T21:17:07-08:00 2009-01-06T21:42:44-08:00 Fixed some markdown syntax Signed-off-by: rick <technoweenie@gmail.com> 497ad4ce7fc04ca39ab45a433b7b094bb834a4fe rick technoweenie@gmail.com 76165106bc0d1e9bd2caac6f033e14e6adbc099b CORP\thanley corpthanley@mtvl08w001094.(none) http://github.com/technoweenie/masochism/commit/eacc03d05eeef76af817b086552f319a4705816c eacc03d05eeef76af817b086552f319a4705816c 2009-01-11T21:17:06-08:00 2009-01-06T21:38:37-08:00 Added Passenger to the instructions. Signed-off-by: rick <technoweenie@gmail.com> 973c1be53304f7cd49783447ab41e603ec46779b rick technoweenie@gmail.com c7a0141d2f1503397dffc73d850c352b5da230a4 Andrew Bloom andrew@andrewkbloom.com http://github.com/technoweenie/masochism/commit/76165106bc0d1e9bd2caac6f033e14e6adbc099b 76165106bc0d1e9bd2caac6f033e14e6adbc099b 2009-01-11T21:16:45-08:00 2009-01-07T14:07:53-08:00 updating master filter to work with new masochism updates Signed-off-by: rick <technoweenie@gmail.com> d71e751c4785e323ab23ca16b5f9b9c4a36746dd rick technoweenie@gmail.com 3a42b57a373ae42cc0c25aa8679d841304bec887 f0723e53302cd2d2f623606f2764803f8d1e9b4b rick technoweenie@gmail.com http://github.com/technoweenie/masochism/commit/c7a0141d2f1503397dffc73d850c352b5da230a4 c7a0141d2f1503397dffc73d850c352b5da230a4 2008-12-15T20:59:54-08:00 2008-12-15T20:59:54-08:00 fix crazy merge issue 89ecd0e62e76ba02f285b799a1e72e0c4e21f5ea rick technoweenie@gmail.com fec38cfbe77dbe569672c568328fe7b8db3f0b87 Eduard Litau elitau@elitau.local http://github.com/technoweenie/masochism/commit/3a42b57a373ae42cc0c25aa8679d841304bec887 3a42b57a373ae42cc0c25aa8679d841304bec887 2008-12-15T20:55:05-08:00 2008-07-31T06:33:27-07:00 delegate columns to master, migrations should work better now Signed-off-by: rick <technoweenie@gmail.com> e4c8f99b8679de24dc4458c563f078fe38fa4320 rick technoweenie@gmail.com 5e3a9e1bc18b40b7470984ffd281c0304e1631e6 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/technoweenie/masochism/commit/f0723e53302cd2d2f623606f2764803f8d1e9b4b f0723e53302cd2d2f623606f2764803f8d1e9b4b 2008-10-31T20:24:54-07:00 2008-10-31T20:24:22-07:00 readme: add a masochism photo 06e580ea4aff93c23a823037282c8d79cc07bcac Mislav Marohnić mislav.marohnic@gmail.com 22dfba6c9dfa9d1b949c42071412c01e5efd847b Mislav Marohnić mislav.marohnic@gmail.com http://github.com/technoweenie/masochism/commit/5e3a9e1bc18b40b7470984ffd281c0304e1631e6 5e3a9e1bc18b40b7470984ffd281c0304e1631e6 2008-10-31T19:59:32-07:00 2008-10-31T19:59:13-07:00 readme: add Thinking Sphinx consideration 5e2f6fd9b4b6ff355aaa46f59513fb70a9872112 Mislav Marohnić mislav.marohnic@gmail.com 8d1e9cacf4a83cfb8d747583004e30b792f76df0 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/technoweenie/masochism/commit/22dfba6c9dfa9d1b949c42071412c01e5efd847b 22dfba6c9dfa9d1b949c42071412c01e5efd847b 2008-10-31T19:59:09-07:00 2008-10-31T19:59:09-07:00 reformat readme c22b60380b3286050739f38a2b7390033a3ce7be Mislav Marohnić mislav.marohnic@gmail.com 25f861638f987dd6a4b767f93538013b1e34f7bf Mislav Marohnić mislav.marohnic@gmail.com http://github.com/technoweenie/masochism/commit/8d1e9cacf4a83cfb8d747583004e30b792f76df0 8d1e9cacf4a83cfb8d747583004e30b792f76df0 2008-10-31T19:17:06-07:00 2008-10-31T19:17:06-07:00 README -> README.markdown 2780ded88d8471e114646ababb333986c3d99bf0 Mislav Marohnić mislav.marohnic@gmail.com 06763bd5d0c0433eab83808d7b9f48f1fff1d544 Alexander Graefe agraefe@mediaventures.de http://github.com/technoweenie/masochism/commit/25f861638f987dd6a4b767f93538013b1e34f7bf 25f861638f987dd6a4b767f93538013b1e34f7bf 2008-10-30T05:14:56-07:00 2008-10-20T05:57:41-07:00 Handle nested ActiveRecord transactions 236828f91cf3d855f3ffaa71c5f02ff2a6f92ced Mislav Marohnić mislav.marohnic@gmail.com 1bd18ef778bb54f7ef3796e0ebd9a21766ab4ab7 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/technoweenie/masochism/commit/06763bd5d0c0433eab83808d7b9f48f1fff1d544 06763bd5d0c0433eab83808d7b9f48f1fff1d544 2008-10-30T04:55:12-07:00 2008-10-30T04:55:12-07:00 update for Rails 2.2 and its thread-safe connection pool e97363bb4723bb0266bf70fbac55e3c9b50bb811 Mislav Marohnić mislav.marohnic@gmail.com 176aa0e93040088ae8c8a8bee7b8b4780b2c2e37 Scott Steadman ss@stdmn.com http://github.com/technoweenie/masochism/commit/1bd18ef778bb54f7ef3796e0ebd9a21766ab4ab7 1bd18ef778bb54f7ef3796e0ebd9a21766ab4ab7 2008-10-19T18:03:59-07:00 2008-10-19T18:03:59-07:00 Added the ability to specify the slave database. Calling or not-calling ConnectionProxy.setup! will work the same if no master or slave connection specified for the current environment. I also removed trailing spaces and added tests. 94f96f077a9919729a01f6bea5713ae9d601dfee Scott Steadman ss@stdmn.com 4aaa0298207ec5042f66afcc68ccb69ae4e5b48f Andrew Bloom andrew@andrewkbloom.com http://github.com/technoweenie/masochism/commit/176aa0e93040088ae8c8a8bee7b8b4780b2c2e37 176aa0e93040088ae8c8a8bee7b8b4780b2c2e37 2008-10-01T12:30:20-07:00 2008-10-01T12:30:20-07:00 better documentation and fixed a typo and a superfluous conditional 38e4c0a22d4f2f1a443cda6b4e156dda87dcbb95 Andrew Bloom andrew@andrewkbloom.com bc014a64730de22e2bde0fab96a667bbdb5b507c Andrew Bloom andrew@andrewkbloom.com http://github.com/technoweenie/masochism/commit/4aaa0298207ec5042f66afcc68ccb69ae4e5b48f 4aaa0298207ec5042f66afcc68ccb69ae4e5b48f 2008-10-01T12:20:09-07:00 2008-10-01T12:20:09-07:00 added some documentation aab35248344d4692104aba0e6d6b99cabd9a401f Andrew Bloom andrew@andrewkbloom.com 6967e377b8846ac09dee0efabcfd421922d6c2da Andrew Bloom andrew@andrewkbloom.com http://github.com/technoweenie/masochism/commit/bc014a64730de22e2bde0fab96a667bbdb5b507c bc014a64730de22e2bde0fab96a667bbdb5b507c 2008-10-01T12:16:29-07:00 2008-10-01T12:16:29-07:00 Added some logging and checking when switching DB's. Also added a class that can be used as an around filter if you need to force certain actions to use the master DB all the time. 53e5bce5202a782b58980d2414819aa60a9f291c Andrew Bloom andrew@andrewkbloom.com fec38cfbe77dbe569672c568328fe7b8db3f0b87 Matt Hodgson mhodgson@youcastr.com http://github.com/technoweenie/masochism/commit/6967e377b8846ac09dee0efabcfd421922d6c2da 6967e377b8846ac09dee0efabcfd421922d6c2da 2008-08-28T12:43:17-07:00 2008-08-28T12:43:17-07:00 Fixed a bug where reload is broken for models that inherit from ActiveReload::MasterDatabase 7e87bcb81b0140d031b2fcbaf7175a5efe978e36 Matt Hodgson mhodgson@youcastr.com 8de9fda345c30d7119dda3b639822cd594682d41 0b58f4511dbc2747912935b24725892cae403ec9 rick technoweenie@gmail.com http://github.com/technoweenie/masochism/commit/fec38cfbe77dbe569672c568328fe7b8db3f0b87 fec38cfbe77dbe569672c568328fe7b8db3f0b87 2008-07-01T13:38:26-07:00 2008-07-01T13:38:26-07:00 Merge commit 'jsmecham/master' d2315e83f8c061ccd0bd4ced8fc357f5541f3b58 rick technoweenie@gmail.com cccfa41154f28953944f063c9682a4a05308e861 Justin Mecham justin@thehive.com http://github.com/technoweenie/masochism/commit/0b58f4511dbc2747912935b24725892cae403ec9 0b58f4511dbc2747912935b24725892cae403ec9 2008-07-01T12:54:07-07:00 2008-07-01T12:54:07-07:00 Added support for declaring your master database configuration per-environment (with a fallback to the old behavior of looking for a single declaration of "master_database"). To use, simply nest a master_database declaration in the desired environment: login: &login adapter: mysql username: database_user password: foo staging: database: staging_database host: stage-db-server.local <<: *login master_database: database: staging_database host: master-db-server.local <<: *login 302af071042fbc414832e3c4569c6851a4cf781f Justin Mecham justin@thehive.com cccfa41154f28953944f063c9682a4a05308e861 Jon jon@funnyordie.com http://github.com/technoweenie/masochism/commit/8de9fda345c30d7119dda3b639822cd594682d41 8de9fda345c30d7119dda3b639822cd594682d41 2008-07-01T12:40:59-07:00 2008-07-01T12:40:59-07:00 added note for Litespeed users f16cdc7f7a8b3b20255dee06e6aee72d3a974f2c Jon jon@funnyordie.com a6933cae9b2634461006c17f7a5412237ef3e8bb rick technoweenie@gmail.com http://github.com/technoweenie/masochism/commit/cccfa41154f28953944f063c9682a4a05308e861 cccfa41154f28953944f063c9682a4a05308e861 2008-05-18T16:49:44-07:00 2008-05-18T16:49:44-07:00 delegate #execute to master [javier ramirez] c1dfc23e5b75ddfde507ffcce48a5e984464cb23 rick technoweenie@gmail.com 7d1d83526e9018e163cf643bc6e7d4d515d0e50c Andy Delcambre andy.delcambre@planetargon.com http://github.com/technoweenie/masochism/commit/a6933cae9b2634461006c17f7a5412237ef3e8bb a6933cae9b2634461006c17f7a5412237ef3e8bb 2008-03-04T08:56:17-08:00 2008-03-04T08:56:17-08:00 changed observers to only query against the master database, was causing a race condition in observers with conditionals bda26c84f8cf9847f69a74c0621cb11e793738ad Andy Delcambre andy.delcambre@planetargon.com 50e9e5806750d7288ab51d7de4297429610173aa Robby Russell robbyrussell@new-host-2.home.lan http://github.com/technoweenie/masochism/commit/7d1d83526e9018e163cf643bc6e7d4d515d0e50c 7d1d83526e9018e163cf643bc6e7d4d515d0e50c 2008-03-03T21:26:28-08:00 2008-03-03T21:19:50-08:00 Realized I erased a line on accident. Adding it back with extra hot sauce. cdd9c57b8fc28cafe1c004f4b719ab82f867cc95 rick technoweenie@gmail.com 00f72aa74c0d893791441a292aa4561ed5caae43 Robby Russell robbyrussell@new-host-2.home.lan http://github.com/technoweenie/masochism/commit/50e9e5806750d7288ab51d7de4297429610173aa 50e9e5806750d7288ab51d7de4297429610173aa 2008-03-03T21:18:50-08:00 2008-03-03T21:13:59-08:00 Updated README file to include an example of the database.yml file and a little more of an overview of what masochism does. 041abcd8ec8573778db0005c7bd75cde3c7d732a rick technoweenie@gmail.com 238f22d847e3b15f687a8280303c026e4d6d7e8f rick technoweenie@gmail.com http://github.com/technoweenie/masochism/commit/00f72aa74c0d893791441a292aa4561ed5caae43 00f72aa74c0d893791441a292aa4561ed5caae43 2008-03-03T20:28:36-08:00 2008-03-03T20:28:36-08:00 fix typo c3a76b0819600deb5c37fcdae8ab71a4ae5413d0 rick technoweenie@gmail.com 720142f99ad2049d15ea4bd2583f8b8f6914c233 rick rick@d98f8484-0aa7-43af-80ea-302c351499d6 http://github.com/technoweenie/masochism/commit/238f22d847e3b15f687a8280303c026e4d6d7e8f 238f22d847e3b15f687a8280303c026e4d6d7e8f 2007-10-05T23:22:08-07:00 2007-10-05T23:22:08-07:00 properly overwrite #reload, no matter when #setup! is called git-svn-id: http://ar-code.svn.engineyard.com/plugins/masochism@32 d98f8484-0aa7-43af-80ea-302c351499d6 db3e7a3571a4112da7595b95ffb2bf9e3207c385 rick rick@d98f8484-0aa7-43af-80ea-302c351499d6 394227098149fae52d95a6be02acf07d64196453 rick rick@d98f8484-0aa7-43af-80ea-302c351499d6 http://github.com/technoweenie/masochism/commit/720142f99ad2049d15ea4bd2583f8b8f6914c233 720142f99ad2049d15ea4bd2583f8b8f6914c233 2007-10-05T22:59:57-07:00 2007-10-05T22:59:57-07:00 allow some more flexibility on when exactly the proxy is setup git-svn-id: http://ar-code.svn.engineyard.com/plugins/masochism@31 d98f8484-0aa7-43af-80ea-302c351499d6 af95e948370b4bd8889b3ba49b38918ec0c155e2 rick rick@d98f8484-0aa7-43af-80ea-302c351499d6 rick rick@d98f8484-0aa7-43af-80ea-302c351499d6 http://github.com/technoweenie/masochism/commit/394227098149fae52d95a6be02acf07d64196453 394227098149fae52d95a6be02acf07d64196453 2007-10-05T22:37:49-07:00 2007-10-05T22:37:49-07:00 add masochism plugin git-svn-id: http://ar-code.svn.engineyard.com/plugins/masochism@30 d98f8484-0aa7-43af-80ea-302c351499d6 5dff71d47af6c6769b1aea58498712e168d563d9 rick rick@d98f8484-0aa7-43af-80ea-302c351499d6