labofsahil/github-event-dataset-2012 huggingface dataset:
Fix minor typos in quick start guide.
Don't throw an error in the block manager when a block is cached on the master due to
a locally computed operation

Conflicts:

	core/src/main/scala/spark/storage/BlockManagerMaster.scala
Fix Spark groupId in Scala Programming Guide.
Merge pull request #294 from JoshRosen/docs/quickstart

Fix minor typos in quickstart and Scala programming guides
Cancel spot instance requests when exiting spark-ec2.
Remove unnecessary hash-map put in MemoryStore
Merge pull request #297 from JoshRosen/fix/ec2-spot-instances

Cancel spot instance requests when exiting spark-ec2
Merge pull request #296 from shivaram/block-manager-fix

Remove unnecessary hash-map put in MemoryStore
Fix check for existing instances during EC2 launch.
Merge pull request #298 from JoshRosen/fix/ec2-existing-cluster-check

Fix check for existing instances during spark-ec2 launch
Made Akka timeout and message frame size configurable, and upped the defaults
Various fixes to standalone mode and web UI:

- Don't report a job as finishing multiple times
- Don't show state of workers as LOADING when they're running
- Show start and finish times in web UI
- Sort web UI tables by ID and time by default
fix bug in getting slave id out of mesos
Fix for connections not being reused (from Josh Rosen)
Added an option to spread out jobs in the standalone mode.
Fixed deadlock in BlockManager.
1. Changed the lock structure of BlockManager by replacing the 337 coarse-grained locks to use BlockInfo objects as per-block fine-grained locks.
2. Changed the MemoryStore lock structure by making the block putting threads lock on a different object (not the memory store) thus making sure putting threads minimally blocks to the getting treads.
3. Added spark.storage.ThreadingTest to stress test the BlockManager using 5 block producer and 5 block consumer threads.
Incorporated Matei's suggestions. Tested with 5 producer(consumer) threads each doing 50k puts (gets), took 15 minutes to run, no errors or deadlocks.
Merge pull request #302 from tdas/blockmanager-fix

Blockmanager fix
Fix K-means example a little
Detect correctly when one has disconnected from a standalone cluster.

SPARK-617 #resolve
Added additional check on incoming files collection
Added -Include switch to Add-AnnotatedContent

- Also fixed issues where the output was a little wonky,
and where it only worked in pipeline mode
- Added docs
Safer reload of environment variables
Bumped version to 0.4.1.0
Merge pull request #3 from Iristyle/bugfixes

Add-AnnotatedContent -Include Switch, bugfixes
Added standard Windows style .editorconfig
Merge pull request #5 from Iristyle/editorconfig

EditorConfig
Added InstanceName param to Invoke-SqlFileSmo
Added default value for param '$Database' for consistency (suggest renaming this to $InstanceName for consistency as well, but this will be a breaking change)
Designer: fixed non-square piece rotation for east/west/south boards.
Added the yazpanda board/piece styles.
Increased distance for getTargetBlock() from 100 to 120.
120 is the maximum that CraftBukkit allows currently.
When setting the piece style for a board, update both the "live" piece
style for the board and the default piece style for the board's style.
Added author comment to yazpanda set.
Chess set definition files can now have a comment field.
E.g. to credit the author of a set, etc.
bootstrap-sass

Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
change some defaults for the test enviroment, make a basic install script in bash
move jasmine back for now; dont want to deal with figuring it out
comments for what I want this to be
remove production pod url override [ci skip]
bootstrap-sass fixes

* Update interim-bootstrap to use the partials from bootstrap-sass,
since some of the names have been changed (and we're using the
Bootstrap 2 javascript now). This should make it easy to keep the
file up to date with the version of Bootstrap we're using.
* Use interim-bootstrap instead of bootstrap-complete in default.css to
avoid the little problem I ran into with Bootstrap + Blueprint grids
not getting along. :)
* Revert the CSS class change (from .span-24.last to .row) in
layouts/application since interim-bootstrap works around that problem.
* Get rid of .icon-black since it's not needed.
* Remove the 60px padding on the page body since it isn't needed and
causes problems with the single post view.
Merge pull request #3138 from stevenh512/bootstrap-sass

bootstrap-sass (w00t)
Update aspects dropdown to say number of selected aspects
rails_admin; i do what i want
update schema, views spec
Initialize on asset precompile

This re-enables 'config.assets.initialize_on_precompile' to allow the
Rails Admin assets to precompile. On Heroku deploys, this may require
the Heroku Labs 'user_env_compile' feature to be enabled, which you
should be using anyway for Asset Sync to work properly. :)
todo++ with interop requirements from keyczar-discuss group
Merge pull request #43 from dhellmann/feature/show-router-ips-609

Add a list of public IPs to the dashboard
add port information to portforward return val
add port information to portforward return val
add self so that method can be found
add in port relationship to portforward
Merge pull request #45 from dhellmann/feature/show-router-ips-609

Handle missing port and router data
Hide NAT and VPN tabs

We are not populating the NAT or VPN tabs yet, so comment
them out so they are not displayed.

Change-Id: I326a7935de38dc404977e0656bba970552bc98c9
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Add get permissions
using ugi instead of connection for per user
fix codereview comment
add hiveweb.sql
Merge pull request #10 from lalaguozhe/master

using ugi instead of connection
Updates for vector bug fixes
add vector type to list of complex types
fix dotimes loop type inference bug
change vector from |3^i32| to /3,i32/
added vector sine example
updates to vsin and vcos
added back support for buffered audio processing
added check for nil predicate
Date string functions
added mongoose.createConnection
Refactored beforeRender. Removed the unreliable .queue() method.
Cleanup/organize settings mostly related to static files.
Remove double included url patterns.
Ignore MEDIA_ROOT.
Overried xforms tempalte to include a working and modern jQuery version.
only one log entry expanded at once
Added ding news tpl
Merge branch 'development' of github.com:ding2tal/ddbasic into development
corrected error in the firefox g disconnect screenshot
Fixed test_add_edit_plugin. Test wasn't properly testing the cancel button functionality due to the wrong URL
Added test for covering 'edit plugin' history navigation
* fixed 'cancel' button on edit plugin form (when used in as PluginField in a custom model)
* mind that the fix duplicates code from pluginadmin.py; however, this seems to be the common pattern (most of the edit_plugin method is already duplicated)
Inheriting from a class that defines 'test_' methods makes the tests from the superclass run twice. Fixed this.
Fixed tests for django<1.4 by making MockStorage instances iterable
Merge pull request #1461 from kux/issue_1452

Plugin cancel button doesn't work when using a PlaceholderField with a custom model - Issue 1452
Added individual notes
Ind. Answers¡
Chapters 1-7
Moar chapters
Fin
Andrew's Notes
Test sublime git features

testing sublime quick commit

another commit to test interactive rebase

Andrew's Notes
Inspired notes
Adding Notes
Ed Weng's notes
merge conflicts
Merge branch 'master' of github.com:JumpstartLab/reading
inspired notes
Add Tabler notes
adding tk notes
Making base file
adding horace inspired notes
Mike Chlipala's notes for Inspired
Added notes
First draft of Inspired discussion questions
Merge branch 'master' of https://github.com/JumpstartLab/reading
Refactored DAO
Minor
Minor
Mysql datasource
Special handling to get stakeholder
Ship information edit
Adding save load to Cfb Mc Moves.
Editing homopolymer/N8/mc/combine/param to include Cfb moves.
Adding notes on proposal to break up DdMd::Simulation
Tested and debugged new readParameters methods.
Back downstairs.
fixed auth_aclcheck test
transformed auth_aclcheck to phpunit
20121101_01
Funciones: param counter

Se agregó el contador de parámetros para al momento de llamarlos saber
cuando parámetros son los indicados.
Presents back
move init page
add win batch files
add doc: command_line.md
redo layout for laptop screen. higher video display res, lower vision res.

Ignore-this: e539369db9229e9a19f1ff2fbf13e311

darcs-hash:20120519041047-312f9-f4bc9c898c8402d0af8dc51518cae1f48d0a1872.gz
canvas now shows the user's angles. fix xyz/xzy bug in poseMatch.

Ignore-this: 9e44189e07b954c27fa34ffccb546dcd

darcs-hash:20120519045341-312f9-a6d33a1801831f771b0d3cf08df3ca26c56c11a0.gz
improve canvas drawing

Ignore-this: f37b6119bb0a61d8dbb76d44a67bd562

darcs-hash:20120519053725-312f9-cba7785be8170f0beb526249b44c31f6202c6548.gz
updated config with more colors

Ignore-this: 9c4c5f7e2881a65e07f9361b2fd191c8

darcs-hash:20120519053749-312f9-35cc6d4d36b0a5c1a95afb19d01febd084aac331.gz
no more privates
more ignores
and more ignores
Allow profile editing only for owners
Edited users indexing
Created admin? helper
Restricted users#destroy only for admins
Fxed admin? helper
Changed main title
Implemented before filter set_role_id
added custom snippets
change font size
merged
Merge branch 'master' of github.com:dsakurai0/dotvim
[#986] Fixed by removing cue trackevents right after the event was fired, ensuring we get no duplicate events
Merge branch 't986' into testswarm
Configure PKI cache dirs

* Configure Cinder, Glance, Nova to put cached credentials
  from keystone.auth_token into /var/cache/<service>

Change-Id: If88088fc287a2f2f4f3e34f6d9be9de3da7ee00d
Merge branch 'prereqs' into dt-test
Merge branch 'no-nova' into dt-test
Merge branch 'pki' into dt-test
Add prereqs.sh

Change-Id: Ic3567aa56ff1bb7b6e65ef46d713998fca27ccd4
Move nova volumes to lib/n-vol

The next in a line of changes to break down stack.sh and make
it a bit more manageable.

Part of blueprint devstack-modular

Change-Id: I9f7ba23391851959412779f842934f5b26724713
Merge branch 'lib-nvol' into dt-test
Merge branch 'ex-secgroups' into dt-test
improve code

move energy display code into subfunction
Iterator simplifications

- oz
  * CIteratorBase -> IteratorBase<const Elem>
  * Iterator::operator Elem* () -> Iterator::operator Elem* () const: non-const
    accessors gained const qualifier, respective const accessors removed
  * array-like iterators typedef'd to oz::Iterator
  * i.key(), i.value() -> i->key, i->value: Container::Elem classes are public,
    iterators cast to Elem* directly, key() and value() iterator members omitted
  * Map::operator [] returns Elem& rather that Key&, Map::value() removed,
    to operator Elem* added
Input class

- client
  * Input class
    + ui::Keyboard merged in
    + part of ui::Mouse merged into Input
Поправил в меню(Добавить предмет, если нету)
Now with thread-safe goodness
fix deploy
fix deploy
fix deploy
fix deploy
trying to avoid too much event contension
Added RSS Search Config for DailyTvTorrents
Added better Provider Image for DailyTvTorrents
Added Button Browser for Transmission Directory
Added Button Browser for TV Donwload Dir
Fixing missing image
Merge branch 'ThePirateBay' of https://github.com/mr-orange/Sick-Beard into ThePirateBay
Using my @hitwise.com e-mail address
Fixed autocomplete in vim
Update GemFile with correct railties version
Sugerir el uso de SHA2

Sugerir el uso de SHA2 para cifrar contraseñas si el usuario tiene una
versión de MySQL igual o superior a la 5.5
Whoops, use correct filename.
web interface (much code lifted from my other project lidless, so not all original) with one graph. gleans data over zmq bus from chiller script. to be expanded.
* Added EmployeeDepartment class to Employee as a Collection.
* Corresponding changes are done on the mapping file.
Added a temporary custom listview to the schedule activity. Placeholder
data until we figure out how we are fetching/storing schedule data.
Fixed that Redmine::VERSION.revision returns nil with svn 1.7 (#12012).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10616 e93f8b46-1217-0410-a6f0-8f06a7374b81
add test of parent issue id beginning sharp to unit issue test (#11979)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10617 e93f8b46-1217-0410-a6f0-8f06a7374b81
set language en at test_create_with_invalid_parent_issue_id of unit issue test (#11979)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10618 e93f8b46-1217-0410-a6f0-8f06a7374b81
code layout cleanup test/unit/issue_test.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10619 e93f8b46-1217-0410-a6f0-8f06a7374b81
Fixed path for loading plugin Gemfile (#10811).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9614 e93f8b46-1217-0410-a6f0-8f06a7374b81
Load rake tasks from Redmine plugins (#10816).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9615 e93f8b46-1217-0410-a6f0-8f06a7374b81
Revert "Initial commit"

This reverts commit 6c5e9a550ae0935abcae6b2dbc6c353e1d213abd.
Merge branch 'master' of github.com:edelight/kitchen

Conflicts:
	README.md
Add repo directory to the gitignore
Fix typo
'data' may be None when requesting solr version info
Update tup_plus.scm
Fix distances for "constellations"
everything works except my version of the storyboard
some weird reference snuck into the button, removing it fixed everything
tail log after installing
Made sounds the right case since it seems to matter in IE.
Merge branch 'synth' of github.com:GeoNode/geonode-client

Conflicts:
	app/autoloader.js
	app/static/externals/gxp
	src/geonode-client/app/static/externals/PrintPreview
	src/geonode-client/app/static/script/app/GeoExplorer.js
Merge ../geonode-client
Removed extra app folder and extra javascript file.
Merge branch 'master' into portals
Add date and compute any day away from today
Enabled GLatitude connector
gnus-notifications: add

Signed-off-by: Julien Danjou <julien@danjou.info>
gnus-notifications: add indirections

So we don't fail on emacsen without notifications library.

Signed-off-by: Julien Danjou <julien@danjou.info>
Filter out negative article numbers during expiry

Fixes #11980

See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11980#8
Change gnus-set-difference from O(N^2) to O(N)

This makes warping into huge groups tolerable.
gnus-request-head: when gnus-override-method is set, allow the backend
`request-head' function to determine the group name on its own.

Without this fix you can end up with some bogus group name that has
nothing to do with the select method actually used.
gnus-try-warping-via-registry: [bugfix] don't act as though you've found the article when you haven't
Fix for macos keychain access
Revert "Add recent argument to nnimap-find-article-by-message-id"

This reverts commit ac8ce21091b89a7a05ad821854f4d3e7ff35a394.

Conflicts:

	lisp/ChangeLog
	lisp/nnimap.el
Fix the defjump macro root expansion

The macro expansion for the root parameter was broken. It caused rinari to fail
jumping.
Fix invalid error message
Incorporate @vhallac's fix for when defjump root is a function
Don't define inflection-uncountables etc. only at compile time

The various inflection-* vars are required by the regular functions
'singularize-string and 'pluralize-string, so they need to be defined
at runtime too, in response to simply requiring the library.

Also, 'cl should be required at runtime, not just at compile time, to
minimize compilation warnings.
Merge pull request #2 from vhallac/master

Small fix in defjump
Merge purcell/master
ignore .elc files
mu4e-cited-4-face: inherit font-lock-keyword-face

The previously inherited face font-lock-pseudo-keyword-face does not
exist in emacs-24.2 (anymore?).
* update TODO
* bump version to 0.9.9.5-dev4
mu4e: fix parent groups of custom groups mu4e and org-mu4e
mu4e: mu4e-split-view: add to custom group mu4e-headers
mu4e: add function mu4e-user-agent

Without this `mail-user-agent' cannot be set to `mu4e-user-agent'
through customize, as the custom type expects a function.  Not sure
whether this function is actually ever used; if it is then returning
the symbol is probably the correct thing to do, as other such
functions suggest.
mu4e: autoload major entry points

Autoload functions `mu4e' and `mu4e~compose-mail' and the definition of
the mail-user-agent `mu4e-user-agent'.  The last to are required so
that `compose-mail' can be used without explicitly loading mu4e.

Also require `mu4e' in mu4e-compose.el (after providing mu4e-compose
to avoid a circular dependencies).  This is required because the
autoload definitions only cause mu4e-compose but not mu4e to be loaded
when using `compose-mail', but if mu4e isn't loaded various handlers
are not loaded (and possibly there are other problems if mu4e is not
fully loaded).
mu4e: fix typo and doc-string formatting
Merge pull request #96 from tarsius/autoload

* basic support for autoloading mu4e
Merge pull request #95 from tarsius/custom

* fix parent groups of custom groups and options
* fix for `find' invocation for non-GNU find (thanks to  Eygene Ryabinkin)
* support single dates (shortcut for ranges) in queries (thanks to Eygene Ryabinkin)
* lib: do some more escaping of body text
* update HACKING
* mu4e-view: list inline-parts as attachments, too.
Merge pull request #90 from tarsius/cited4

* mu4e-cited-4-face: inherit font-lock-keyword-face
Fix parens typo in add-hook example

You had (let ((symbol valueform) body)).
Merge pull request #104 from dpflug/patch-1

* fix parens typo in add-hook example
Change refile target in region email.

Now, mark commands with region on headers view,
target of the first email is reflected in the rest of email.

```
              Date         From     Subject
--------------------------------------------
              2012-12-05   Github   ...
              2012-12-05   Yahoo!   ...
              2012-12-05   Work     ...

  refiling to

              Date         From     Subject
--------------------------------------------
r -> /github  2012-12-05   Github   ...
r -> /github  2012-12-05   Yahoo!   ...
r -> /github  2012-12-05   Work     ...
```

In this patch, change target in region email.

```
              Date         From     Subject
--------------------------------------------
r -> /github  2012-12-05   Github   ...
r -> /yahoo   2012-12-05   Yahoo!   ...
r -> /work    2012-12-05   Work     ...
```
Adds an action to change tags header

New action mu4e-action-retag-message that reads tag changes from the user and
modifies the corresponding header (X-Keywords, X-Label, etc) on the message.
populating sandbox
Make test execution order well-defined

I doubt it makes a difference, but let's eliminate sources of
flickeringness.
Merge pull request #1248 from joliss/test

Make test execution order well-defined
Remove unnecessary unknownProperty/setUnknownProperty functions on
Observable mixin.

With @kselden
Documentation: Need to pass params when calling _super
Merge pull request #767 from ryanto/master

Documentation fix for View State
Run ember-viewstates tests by default
Make sure JSHint warns of trailing commas
Corrected comments
WIP
Fix metal array polyfills
Spelling fixes for public API docs.
Merge pull request #649 from lukemelia/docs-spelling

Spelling fixes for public API docs.
Move startup.py to a new file, coretasks.py

This is still written as a module, but is always loaded. In addition, extra documentation was added, function signatures were changed and ping timeout detection actually works now
Relevant issue: Core cleanup tracker, #69
changed root prompt colors, virtualenv support in xterm title
Scroll no filtro
prepare for next build
Revert "prepare for next build"

This reverts commit 4999b163a0ada51199caf80315a02849ad0f1c27.
correct path to asset pipeline page
payments sorta work
Ajout du lien/icône admin réservé aux admins
Merge pull request #73 from Lascar-Usuel/design_css

Ajout du lien d'admin
New folder structure v 2

Signed-off-by: Robin Westerlundh <entropin@gmal.com>
Added RT ticket creation, working on send_mail.  Connection refused so far...
Updates for 2.1.2
Checkstyle and codenarc config
start fix for production
Site updated at 2012-09-24 20:04:23 UTC
Alert settings now actually have an effect.

At last!
Started incorporating position morphing and automatic style change detection
Added reference directory and put RRI doc in it.
Merge branch 'master' of github.com:evenator/masters
Added deploy:drop
Use try_sudo instead of run
run "#{try_sudo}"
Merge pull request #216 from vslinko/patch-3

Added deploy:drop
- Added GracefulShutdownOptions
Switching timeline and input
Some more refactoring
Adding a ajax post
Added support for eZ Demo design: now showing the full-blown search
interfaces (including facets)
(cherry picked from commit c762521d3f54fae4757921f89eec208e4fe43457)
Added proper dependencies between ezfind and ezdemo (in extension.xml)
(cherry picked from commit 006275f9c09cb81567b4b897ac2b67b42b5f882b)
boldi
headings
custom command to load all the crap
Fim da preparação base
Preparacao base
ANDROID: Fixed tapping touchpad not sending left clicks
GRAPHICS: Rename NEON_ASPECT_CORRECTOR to USE_ARM_NEON_ASPECT_CORRECTOR

* This better matches other ARM codepaths.
* Also remove #ifdef OPENPANDORA as moved to configure.
CONFIGURE: Clean up OpenPandora flags and add define for USE_ARM_NEON_ASPECT_CORRECTOR
SCI: Add the Inside the Chest / Benind the Developer's Shield demo
SCI: Fix bug #3578336 - "SCI: Codename: ICEMAN - No 'EGA undithering' option"
SCI: Add another version of Castle of Dr. Brain (bug #3578286)
SCI: Fix bug #3578335 - "SCI: Mixed-Up Mother Goose EGA - crash upon choosing kid"

In several SCI0 games, the parameter to kDoSoundFade can be null.
We handle that case, instead of adding individual workarounds per game
SCI: Add a workaround for bug #3568452 - "SCI: QFG1VGA - Path finding bug in the forest"

This workaround has been added for now to stop the game from freezing.
A more correct solution would be to match our pathfinding algorithm
to what SSCI is doing, but with this workaround we can stop the more
immediate problem (game freezing) now.
WINTERMUTE: Avoid using __DATE__ and __TIME__ in-engine
CONFIGURE: Use -fPIC instead of -fpic on Linux and FreeBSD.

This allows compilation of plugins on PowerPC. This is done similar to what
was proposed in patch #3575572 "Fails to build on Linux PowerPC when using plugins".
I chose to use -fPIC unconditionally, since it will only make a difference on
platforms, which will require -fPIC, like PowerPC. On amd64 for example gcc
produces the same code.
WINTERMUTE: Add a hack to allow videos to loop
WINTERMUTE: Convert ' correctly from CP1252
Merge pull request #288 from murgo/master

ANDROID: Fixed tapping touchpad not sending left clicks
GRAPHICS: Mark decoders used by Wintermute as such.
VIDEO: Mark Theora-decoder as used by Wintermute.
CONFIGURE: Enable Tony engine
Add detection for original Italian version.
TONY: Fix translation of Italian comment

Thanks to Giovanni Bajo for noticing and correcting this.
Merge pull request #289 from rasky/add_italian_version

Add detection for original Italian version.
TONY: fix volumes of sound effects.

The game was using a logarithmic scale (through DirectSound)
so we need a log->linear conversion to feed the mixer.
Add alpha hint
vim stuff, zshrc
Removendo atributo moeda em local incorreto
Updated Mobile App UI Elements with more fancy icons :)
Muestra la temperatura usando la api de google
Añadido declaración para UTF-8
Por ahora sólo muestra la temperatura
directorios eclipse
- Added type for Scope, Type and Value pool (vector), removed calloc calls
backup26
README açıklama
fixing whitespace annoyance
Test for list style.
Changes .gitignore file and adds Room scaffold
removes old .swp files
Merge branch 'master' of github.com:fievelk/factotum
convert fields ending with Price to float
Fixed AbilitiesAbility
Make the website tests to pass
Made symbol names for blocks nicer (makes the stack trace easier to follow)
Fixed bad bug with weaks
Made block closures copy the closed over block
nothing really
Fixed bug in ternary operator where instructions where generated in the wrong order
Fixed case where AND operator would create useless branches
Allow overriding MenuView width
Add a stub for a python PreAtomishReader.
pb memo utf8
bold font fix
Video thumbnail is resized depend on its size
Update submodule reference to point to latest auto-generated changes
Merge pull request #1441 from folecr/updatesubmodulereference

Update submodule reference to point to latest auto-generated changes
Setting up publishing to oss.sonatype.org
script: fix compilation on OS X
decided I don't like the gitpush change
fixed a potential unicode bug in change message function
added yumbum style
Aclaracio granizo liberty.
'Convert' README from rdoc to markdown.
Update README.

Explain that you'll need to install elasticsearch to use Sauron.
Populate the to attribute for message and presence stanzas if the server leaves it blank.
バージョン間違えた
type assertion
CRM-10585 - hack not accepted into core for membership types w 13 months
Merge branch 'master' of github.com:fuzionnz/civicrm
Finished the contact form… page still needs some work. Migrated theme to use bootstrap by twitter

Themes switch is due to incompleteness of current theme, and time
restrictions.
previous commit did not make all changes
scons msaFluid samples
8/15/12 End of Night

Started media queries and fixing jQuery bugs.
added ability to reposition render window
Exposing more of the parameters to the program_options, for changing from command-line, etc.
Readd support for building a CentOS 5.7 sledgehammer.
Make clone_barclamp go ahead create local tracking branches for
branches from origin.
Fix up branch sync issues around doing pull requests for feature branches.
Merge remote-tracking branch 'refs/remotes/dell/personal/VictorLowther/master'
Merge remote-tracking branch 'origin/master'
Make sure that br_pulls always has the proper name of the remote ref
at Github.
Make sure pull requests die if we do not get back a pull request
number and URL.
Remove sledgehammer files in redhat 5.7
Rework pull-requests-gen for barclamps to have it align with the code
for branches.
Have do_pull_request not actaully make a pull request when debugging.
Add support for scrubbing obsolete pull request branches, and make
pull-requests-prep call it.
Pull-requests-prep no longer needs to do backup.

Instead, pull-requests-gen directly pushes the branches it needs.
Merge remote-tracking branch 'refs/remotes/dell/personal/VictorLowther/cloudera-os-build' into cloudera-os-build
Merge branch 'master' into cloudera-os-build
Use our own revision description function since git-describe was not
working for us.
Merge branch 'master' into cloudera-os-build
Optimize scrubbing merge pull requests.
Merge branch 'master' into cloudera-os-build
Merge pull request #351 from VictorLowther/pull-req-master-a66ddc933c

Readd support for Sledgehammer on CentOS 5.7, and pull in updates for dev. [1/4]
Merge pull request #352 from VictorLowther/pull-req-cloudera-os-build-70adc061db

Readd support for Sledgehammer on CentOS 5.7, and pull in updates for dev. [2/4]
Overrode action performed action event for compute.
Using getJSON with callback to force JSONP from CartoDB.
Changing search sql api call to use jsonp.
Code formatting and cleanup.
Switching List tool query to go through CloudFront witha  JSON-P request instead of AppEngine cache/get proxy.
Using $.getJSON for consistency, and did some code simplification/cleanup
Using $.trim() vs String.trim() for IE compatibility.
Updating compiled code.
Merge pull request #133 from MapofLife/feature/list-tool-jsonp

Feature/list tool jsonp
Merge pull request #132 from MapofLife/feature/search-with-jsonp

Feature/search with jsonp
Merge branch 'develop' of github.com:MapofLife/MOL into feature/press-page
Some corrections like using the dictionary mixin for unicode filtering
ported to the new polling feature
added debug logging for polling
refactored details
Add return code support
Removed Helpers.h/m not used
video integration to articles
safe category and slide delete
category/videos index table css
js include only for controller
language index table css
fix language edit
Continue supporting User-Agent as client
Improve udp error message
Why not use java mapped files? Because they are unpredictable!
Commit for db user, board, advertisement, and tile
Bump version to 0.6.0.0
v0.13

 - Make types constants inlineable by perl (GH#2) (thanks, DOLMEN!)
 - Add a proper Changes file (GH#3)
 - Overload &{} to make a FFI::Raw object similar to a CODE ref (GH#4)
add change cursor color in urxvt
add xterm change cursor shape
add xterm config
small changes to integrate
Fixed cumulative distance markers.
Fixed dashed measure line.
update Makefile
update Makefile
enhance inputrc
Look at these tickets
Add Python3.3 tests and feed pypy with corrected isodate package.
product pages, fixes
key: using filesystem wrapper
key: removing testadata dir
key: using tsuru/fs filesystem abstraction
Merge branch 'master' of github.com:globocom/gandalf
Updated code so that there are no failing tests on MSVC 2010.
Use correct branch for twrp
renamed class
added basic infrastructure for placesnearme
Moved callback initializing and preparations to the the constructor.
Renamed JSMin class to rah_minify_JSMin to comply with namespace and prefixing rules/restrictions.

This will be compiled to the distributed source too.
node modules has been updated
added
Added  StaticPages controller
Finished home page stub
Finish layout and routes
Use anonymous functions to clean up this connection stuff.
added lisp projects
add __del__ method
make fanout notifier an actor

Links to subscribers and prunes their subscriptions when they are
terminated. No need for a mutex or weakrefs.
test unsubscribe
prune subscriptions from dead actors

Test fails; not sure how to kill a weakref.
Added several existing projects.
Missing file from fusion connector
Add link to link
(amend)
PIG-3020: "Duplicate uid in schema" error when joining two relations derived from the same load statement (jcoveney)

git-svn-id: https://svn.apache.org/repos/asf/pig/branches/branch-0.11@1423259 13f79535-47bb-0310-9956-ffa450edef68
Bugfix to page loading
Finished implementation of JSON OutputWriter. Removed domain architecture columns for unchanged best blast hits. They are _always_ NULL.
Remove unnecessary scripts.
Use FSharp.PowerPack.Compatibility.dll only when necessary.
Added an example package.
Added compiled version of less files.
1. added README for coding_convention
Capitulo IV
fix
Добавил возможность удаления новости
Добавил тини в комментарии
GPRS.pde: Renamed the RELE define to UNLOCK_PIN for easier extensibility in the future
GPRS.pde: reorganized the setup()
GPRS.pde:
* global char c is now initialized in the begining
* Added new function read_resp() which will be responsible for reading everything from the GPRS module into a line buffer
* Added global line[] buffer and line_pos
Cleaned all of the old code
GPRS.pde:
* Simplified read_resp() function and limit the read only until \n is reached
* Added configure_gprs() function to setup the GPRS module with the options I need
* Added function parse_resp() so it can see when the GPRS module is registered and ready for AT commands
* Added function read_sms() to pull the SMSes out of the GPRS module
* Added function parse_phone() to get the phone number out of the SMS
* Changed the main loop to reflect the above changes
update between conference
Merge remote branch 'origin/dryjilka_warehouse' into dryjilka_warehouse
Fix tuppari version test failed
BUGFIX Fixed regression where image and link popups don't open
Bug:ListBoxField and DropdownField does not respect getSource in all Places
In some places source is referenced directly and assumed to be array, while in some places the getSource() method is used instead.
By changing this you have more freedom when extending these classes
FIXED: collateFamilyIDs() nested groups throws error

http://open.silverstripe.org/ticket/7835
Merge pull request #794 from creamarketing/ListboxField_Inconsistency

FIX: ListBoxField and DropdownField should respect getSource()
Merge pull request #795 from theorytank/3.0

FIX: collateFamilyIDs() nested groups throws error
ASDFAFSAF
fix build project with utf-8 filename
update compass version warning text
add build project report
realtime update build project report ui
- Minor
- Major fixes
- Listing now works properly
Update centos/nginx/install-nginx.rdoc
rm install-nginx-passenger.sh
created user a table
added a microposts table
added a microposts table
finshi git hub
modify to test KoNLP_Zip_0.75
test jar was added.
extractNoun test code
prepare temp code
make interface with HanNanum Analyzer for direct access to zipped dictionaries
added modified interfaces
useSejongDic, useSystemDic functions
add encoding options
insert Rd files
added readZipDic function.
change dictionary names and re-org codes
True/False mixup in BaseMetric documentation
New --verbose option added to der.py
Added parallel computation option
algumas observacoes
kdebase-workspace is no more
Add doc option to qrencode
Tweak the custom routes mechanism

It didn’t seem to work before. (?)

Note that this requires a change to the code as e.g. in
https://github.com/sebbacon/alavetelitheme/blob/master/lib/config/custom-routes.rb
because the route configuration code should not be inside a
Dispatcher.to_prepare block now.
Add SURVEY_URL and SURVEY_SECRET to general.yml-example

In the wdtk branch *ONLY* because the deployment system likes
the example file to define the same variables as the actual
config file.
Only trailing whitespace
Admin users clicking confirmation links

Fixes #446. See issue for details.
No code changes

Just trailing whitespace & one comment.
Fix the "log in as" function

Previously the "log in as" function after 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b
would attempt to log the admin user out before issuing the redirect. Unfortunately
this approach does not work on WhatDoTheyKnow, where the admin pages are served via
a different domain (secure.mysociety.org) and so do not share session information with
the rest of the site.

This commit changes it to mark the PostRedirect with circumstance == "login_as",
which signals the user controller to log out the previous user even if they are
an admin. In other words, the user is logged out on the main site rather than the
admin site, skirting this problem.

Closes #450.
Merge branch 'wdtk' into develop
Fixes to integration/admin_spec

1. Remove useless call to spec_helper’s basic_auth_login method
2. Use Base64.encode64, rather than b64encode which also prints
   the encoded string to standard output.
Fix typo in link
Reorder the wording so that it's clear before you do this step (just tripped me up)
Correct constant name
tmp directory should be available
add a config.ru so that rack servers can run alaveteli more seamlessly
Add a caveat

Add a caveat about update-exim4.conf that bit someone during the
installfest at AlaveteliCon.
Merge pull request #462 from jpmckinney/small-fixes

Small fixes
Remove cache/zips/ before running tests that write to there
use Rails.root, not RAILS_ROOT
Merge pull request #463 from mhl/tiny-zip-test-fix

One-line fix for a misleading test failure
Merge pull request #459 from henare/fix-doco

Fix doco
Merge pull request #464 from jpmckinney/small-fixes

Small fixes
ensure maintenance mode is cleared when mock app is deleted
notifications and panel
- Added some gitignores
- Modified wiz/DH timers
- Faster sell at snagit
removed unnecessary code
progress strings update in real time
Removed achievement count check, not needed
Removed secret achievement label
set version back to neutral
Added 'host' column to index, and added new view to show message in a separate page.
Visual enhacement to index and view that shows a message.
Client: implemented command line arguments for setting the severity
Client: implemented tests for CLI
Client: implemented more tests for CLI
Updated TODO.md
Added command line arguments to modify versions from scripts.
Updated README
Removed release instructions

To avoid duplication, removed the instructions for releasing,
since the release script do all the work now.
Changed version 0.0.2 to 0.0.9-dev

Sincronized version number with main project.
Remove the need of manual intervention and upload to pypi
Fix typo in script name (forgot .py)

Also removed the use of virtualenv's python in the script
Updated version to 0.0.9
Updated version to 0.0.10-dev
Minor changes

…
Plugin::Validatorを追加
validator liteの設定を追加
パスワードも引数へ追加
configへvalidatorやCryptの設定を追加
数値と文字列を受け入れる都合上いったん普通の引数受け取りへ
passwdが数値と文字列両方やれないといけないので回避策
引数が間違っていた
Mutuki::Plugin::Validatorを追加
validatotionに対応
Validatorクラスを追加
use/add.ttへvalidatorテンプレートを追加
FormValidator::Liteを追加
submoduleたちを削除
Signed-off-by: hisasann <hisasann25@gmail.com>
Fix Validators
neat things up
Merge branch 'master' of https://github.com/hpinio/BuncisMVC
except to enable url argument for plugin syntax when running 1.8
Some evening work updates. Staging tests 100% complete.
fixed login box on main screen showing after logging in.  added tweaks to paginator for course views now only shows 5 classes per page.
recode table
recode table
bugfix
fix bug that setGrid method can't set containerWidth and columnWidth.
enable cache; switch back to using live imits
update config

Signed-off-by: azrael <azrael@imatlas.com>
Preparing for release
Lint fixes. Hoping to have fixed classpath issue with live APK
Reading current Aardvark version from Maven-generated pom.properties file
Workaround for wrong permissions being generated by maven-jar-plugin
Updating lockfile
Merge branch 'master' of github.com:ign/code.ign.com
Update adapter for database template to mysql2
Adding sliders; bugfixes
add testmodel from XuSheng
add spring path to config.properties
Repair sample of form-type report
Merge branch 'develop' of https://github.com/iisihub/hncb_rod.git into
develop

Conflicts:
	rod-app/src/main/java/com/iisigroup/rod/handler/Txn10102Handler.java
	rod-web/src/main/webapp/viewpage/system/txn10102.jsp
more simple architection
q001 example domain clear, looking for a good model implementation
quick and dirty table representation and page log output section that shows items as JSON strings
Added bootstrap, Topic modell, relations
Added command line switch for side by side diffs
api: hot fixes
Alpha branch
add colordiff settings
added seperator on list page
Preliminary SCrypt configuration and test. Most still in incorrect
packages.
Updated entities within account, shoppingcart and wishlist packages to
have static factories and better invariant management
Automatically hide tweet actions
Testes finais do Flipbit e do SwapGenes.

Ass: Pedro Alves e André Simões.
inicio
rama master vistavirtual 28nov2012 7:14pm
rama issue1 vistavirtual 28nov2012
rama master 28nov2012 7:16 pm
Merge branch 'issue1'

Conflicts:
	notepad.txt
Merge remote-tracking branch 'github/master'
Update csp301/.settings/org.eclipse.jdt.core.prefs
check if ls -lT is available
space after comma
clean up
use stat instead for directory
define for DM_HELPER_DLL_EXPORT also set for macosx
Slide save, bugfixes
properly detects the end of the game
Added a simple logging framework, as slf4s doesn't appear to be maintained or migrated anymore
adding notes about nerdtree and mini buffer explorer
add and pussh
Renamed floap to fixedpoint and added new functionality
Ignore dictionary changes
Add helpers for working in erb
Set .md to be a markdown file extension
Minor edits to the README file
Added sprockets-rails dependency instead of sprockets-helpers
Changed exception exercise to use a form for user input
AS7-5323 component upgrade of Hibernate to 4.1.6
AS7-4967 Upgrade Infinispan to 5.1.6.FINAL
AS7-5358 Upgrade PicketBox to 4.0.12.Final
Fix AS7-5341 implementation.  ServiceContainerHelper.wait() and associated service listener were not necessarily syncing on the same object.
AS7-5361 Fix race condition
AS7-5134 Unable to not set key-alias for ssl - with new xsd + fallback for 1.1 schema
AS7-5363 NPE on tab completion
Allow direct text value in parameter element.
Updated to only check the first part of the text
added module standings
the real add..
latex book: initial template export and crop preset.
latex export: centered images and top aligned them.
latex: nicer scaled fonts.
latex: book export now with correct trim box and nice centering + text layout possibilities.
latex: fix trim box for the 100th time.
latex: ported latex export to new locator interface.
general: assertion cleanup.
latex book: initial template export and crop preset.
latex export: centered images and top aligned them.
latex: nicer scaled fonts.
latex: book export now with correct trim box and nice centering + text layout possibilities.
latex: fix trim box for the 100th time.
latex: ported latex export to new locator interface.
general: assertion cleanup.
nlmeans: correct denormalized float check.
Install latex style file to correct directory

... so it gets found when exporting to a latex book
Added config option allowing to disable/enable confirm dialog before copying images.
Declared generic fileop job function static.
ensure that bauhaus popup is on top of main window, fix for bug #8862
Allow the user to just select a folder when looking for a filmroll

Using now gtk_filechooser_get_uri, which allows to use the filchooser
to just focus on the guy they are going to use.
Merge branch 'master' into zfs.121011
Linux-3.6 fixes. Need to ./autogen.sh in zfs now, as the linux-3.6 patch adds autoconf macros. Which means that all of my Makefile.in patches need to be puplifted to Makefile.am patches.
Merge branch 'zfs.121011' into pending
started pdf invoice
fixed nonusaddress label
initial commit
added hworld files
test
remove empty language from args
checking in initial code - currently a completely fragmented starting point.
adding client folder
added urza script for creating directory tree and seed folders
tons of changes. Create script should now work, basic working framework in place.
adding tons more documentation, changing urza create to urza init
moving things around, adding client.js (for actual use) and app.js (for setup and programatic addition of views). Adding templates folder. UNSTABLE, UNTESTED
moving most of the heavy-lifting client side js out of the example app and into the core.
removing tons of specific stuff
finishing up adding views and removing views
Adding create partial and create view, remove both
updating readme and app.start()
shuffling things attempting a first integration
adding missing dependencies, making changes to support integration with embr
fixing up providers to properly load, more changes
for compatibility.
adding layout header option
adding support for default routes, fixing named routes, experimental support for regex client side routes.
adding support for optional params via runtime conversion to regex
removing scripts, exposing logger and reporter, changing winston dependency to my fork to add pretty print
attempting a fix for app.build.js - will need to test in a client app
fixing a bunch of issues with requirejs optimizer not working correctly. Still needs fix for dynamically included views.
Can't figure out what's wrong with bootstrap modal
Removed Icons
Generada la pantalla de Login, y un esbozo de la principal
[Taskard #5] Creada la ventana de Imprimir
Creada la interface de Imprimir
Change chinese language identifier
Merge pull request #315 from Nathan-Wang/settings-zh

Settings zh - Chinese language identifier changed from and adjective to a noun. Thanks Nathan-Wang.
Merge branch 'dev' of github.com:GeoNode/geonode into portals
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into opendri-dev
Merge branch 'design' of github.com:jj0hns0n/geonode into opendri-dev
Merge branch 'portals' of github.com:jj0hns0n/geonode into opendri-dev
Update urlconfs in _maps_filters.html
Update urlconfs
Update urlconfs
Remove extra map
minor fix (warning)
Merge branch 'UnaryOperationShapes' into IntegralInvariantCurvatureEstimation
Minor fix (warning + errors with clang)
Google protocol buffers aren't optional.
README.txt

测试文件
Fixing a local installation issue on cypress:initialize rake task
Merge branch 'develop' of https://github.com/jmazella/cypress into develop
adding bundle model, changing measure importer to match bonnie importer
interactive countback walkthrough test added
add cache submodule
tweaks to smooth out the looks of events
Removing Repository:: from the memory mapper.
Add stat timeline
CA-69463: Don't return a list of failed tasks from wait_for_all_tasks.

These tasks may have been destroyed in the meantime, and we ignore the
return value anyway.

Signed-off-by: John Else <john.else@citrix.com>
1st check-in
Fist chicken
Merge branch 'master' of https://github.com/johngh/monkeybiz
Made sure hostname is never set to empty
Internal array functions
i have created inex method
Add HOWTO for installation, running, etc.
due to the move to backbone.js, this computation is done client-side and not needed server-side.
modify the wrapper to take a custom target.
add support for the -t attribute.
remove whitespace.
rename mytest to wrapper.
Started working on improving messaging center. Ultimate goal is to limit messages sent and dont duplicate.
cleared
2012-03-27 12:28:08 -0700
Allow root to be defined
Initial work on app generation
Add Dynamo.app and Dynamo.env
Nicer TMUX colors.
building authentication module
Added a shitty readme
Code cleanup, load() and save() methods, get_context() method
load() fixes, regex fix for @var matching
Fix dirty freeze au lancement de la comparaison
push the pom
Core: Make uniqueId test pass in IE6/7 with jQuery 1.6, where undefined id is returned as empty string
Tooltip: Make title-tests pass in IE6/7 with jQuery 1.6, where undefined attribute is returned as empty string
revised language files
Excluding .bz2 files from source-dist.
Added trivial new[] and delete[] operators.
Fix "mergeable" and "all" review options.

Also fix typo mergable -> mergeable.
Add rss xml parsing
Add podcast list management
Add a podcast downloading function, although it's not used yet
Add .gitignore file
Update Readme.md
Added unproject to the public API.
Now with passing tests.
Merge pull request #14 from alankligman/develop

Develop
deleted extra migration. slight styling modifications.
first tests.
fixed numbering bug. fixed bug where link vote sometimes read as comment vote.
Add models User, Link, Vote, Comment. Add authentication using Bcrypt. User log in/out is functional.
MAJOR cleanup of the UI.
tweaked and readded hu text
bumped timecop, rails, excon
Update Rafał Bigaj's email address in Contributors.rdoc at his request
Adding an example of how to insert array data using a prepared statement (issue #145)
Add a default fallback_application_name to connection string
Write specs for the fallback_application_name addition.
Adding some fixes for PostgreSQL 9.2.x
add a bunch of files to .gitignore.
Make the specs run on JRuby.

- use pg_config to determine postgresql bin directory and use it if available
- If we're running on a no fork system redirect the output of the commands.
  Otherwise pg_ctl won't leave the shell process group and block the specs from finishing
use '-m fast' when stopping postmaster
use Thread::fork/join instead of Process::fork/wait if we're running using JRuby.
- torrent link on dmm
dfwfdfd
Agregando mas controllers :)
fixed search results title in result page
changed line-height in calendar month events preventing seeing top of next line
All bottom tab items now work on mobile site
hjdyjd
Initial commit of Dazzle.
Converted to MVC 3.0
Blaze: add Num constraint to bCont, for ghc-7.5
Benchmark for FTP (in Erlang)
Documentation for benchmark (EDoc)
Merge remote-tracking branch 'origin/master'

Not-really-intended, but pushed wrong commit to repo.
Oh well...

Conflicts:
	ftpc/ftpc.erl
exam assignments
Improve message after import from ImageDirectory
Changed by Ross TESTING!