Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase onto master #12

Merged
merged 33 commits into from
Mar 14, 2016
Merged

Rebase onto master #12

merged 33 commits into from
Mar 14, 2016

Conversation

geraldus
Copy link
Collaborator

This brings back MIT license and resolves haddock issue (:

agocorona and others added 30 commits March 13, 2016 13:45
browser nodes running transient programs compiled with ghcjs are
integrated with server nodes. Just compile the program with ghcjs and
point the browser to http://server:port.

Browser nodes integrate Hplayground (package ghcjs-hplay) they can create
widgets and control the server nodes. A computation can move from browser
to server and back.  Widgets with code running in browser and servers can
compose with others. browser nodes can control many server nodes.

map-reduce (Transient.DDS module) now has a true shuffle stage. Not tested
yet.

EVERITHING NEW IS IN AN ALPHA STAGE.
agocorona added a commit that referenced this pull request Mar 14, 2016
@agocorona agocorona merged commit e9065f4 into transient-haskell:master Mar 14, 2016
@agocorona
Copy link
Collaborator

ops, I did not wanted this yet, since the ghcjs branch had many experimental things that have not been tested.

@geraldus
Copy link
Collaborator Author

Oh, sorry, I thought this will be merged into ghcjs branch! You can revert this simply (there should be button in this PR). Let's figure out how to merge this stuff into proper branch!

@geraldus
Copy link
Collaborator Author

Also, if you would like you can then interactively rebase everything again un-picking all commits in this pull request plus revert commits and force-push this state to master branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants